summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVictoria Lease <violets@google.com>2014-03-17 16:03:28 -0700
committerVictoria Lease <violets@google.com>2014-03-18 16:22:20 +0000
commit1c12f9e76298c757423155ad812890d27effafe8 (patch)
tree4c47256fda7eef2ca645a39a04064bbb47d8d8e2
parentb9ba0c6c43f0f7f0d5e347030e3c86a86ed74542 (diff)
downloadframeworks_base-1c12f9e76298c757423155ad812890d27effafe8.zip
frameworks_base-1c12f9e76298c757423155ad812890d27effafe8.tar.gz
frameworks_base-1c12f9e76298c757423155ad812890d27effafe8.tar.bz2
malloc some advances
Bug: 13506939 Change-Id: I87ad616960c4f16bc55d8b906049dbd4f001d6a5 (cherry picked from commit 3af2a37e057b31617b8f4eeb22ac3ef85c3fd5aa)
-rw-r--r--core/jni/android/graphics/Paint.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/core/jni/android/graphics/Paint.cpp b/core/jni/android/graphics/Paint.cpp
index a65262c..8f68ae3 100644
--- a/core/jni/android/graphics/Paint.cpp
+++ b/core/jni/android/graphics/Paint.cpp
@@ -512,7 +512,7 @@ public:
return 0;
}
}
- jfloat advancesArray[count];
+ jfloat* advancesArray = new jfloat[count];
jfloat totalAdvance = 0;
TextLayout::getTextRunAdvances(paint, text, start, count, contextCount, flags,
@@ -521,6 +521,7 @@ public:
if (advances != NULL) {
env->SetFloatArrayRegion(advances, advancesIndex, count, advancesArray);
}
+ delete [] advancesArray;
return totalAdvance;
}