diff options
| author | Victoria Lease <violets@google.com> | 2014-03-19 14:51:58 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-19 14:51:58 -0700 |
| commit | 6b96ecca90555e04da8a4477d6dc6de83e7b9ee1 (patch) | |
| tree | 0bcabe33e6c450e1d1159b06d7ba4549d8bfb834 /core | |
| parent | 25fb7133901f6a538d5d365f3c0c1c936e76679d (diff) | |
| parent | 32753f4f1c0dfd810d68759cce3e51cf788084f8 (diff) | |
| download | frameworks_base-6b96ecca90555e04da8a4477d6dc6de83e7b9ee1.zip frameworks_base-6b96ecca90555e04da8a4477d6dc6de83e7b9ee1.tar.gz frameworks_base-6b96ecca90555e04da8a4477d6dc6de83e7b9ee1.tar.bz2 | |
am 32753f4f: am 31912122: am 6eb28103: am 183f97b7: am 1c12f9e7: malloc some advances
* commit '32753f4f1c0dfd810d68759cce3e51cf788084f8':
malloc some advances
Diffstat (limited to 'core')
| -rw-r--r-- | core/jni/android/graphics/Paint.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/jni/android/graphics/Paint.cpp b/core/jni/android/graphics/Paint.cpp index 150caf3..f5f1e86 100644 --- a/core/jni/android/graphics/Paint.cpp +++ b/core/jni/android/graphics/Paint.cpp @@ -554,7 +554,7 @@ public: return 0; } } - jfloat advancesArray[count]; + jfloat* advancesArray = new jfloat[count]; jfloat totalAdvance = 0; TextLayout::getTextRunAdvances(paint, text, start, count, contextCount, flags, @@ -563,6 +563,7 @@ public: if (advances != NULL) { env->SetFloatArrayRegion(advances, advancesIndex, count, advancesArray); } + delete [] advancesArray; return totalAdvance; } |