diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2013-07-08 17:51:23 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-07-08 17:51:24 +0000 |
| commit | a4854d39ae6e03d6b9430bfdef85ecb7505e0139 (patch) | |
| tree | 5306ffe49075b4555faa6da7f4696ee944172c4a | |
| parent | 2a26547fd391c8038ad9f57fcb51d62fba0ee543 (diff) | |
| parent | b264f5f83f916af84dd7321cf957a7a6730fe6a8 (diff) | |
| download | frameworks_base-a4854d39ae6e03d6b9430bfdef85ecb7505e0139.zip frameworks_base-a4854d39ae6e03d6b9430bfdef85ecb7505e0139.tar.gz frameworks_base-a4854d39ae6e03d6b9430bfdef85ecb7505e0139.tar.bz2 | |
Merge "Mixed delete/delete[]."
| -rw-r--r-- | core/jni/android/graphics/HarfbuzzSkia.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/jni/android/graphics/HarfbuzzSkia.cpp b/core/jni/android/graphics/HarfbuzzSkia.cpp index 7e08379..79db15a 100644 --- a/core/jni/android/graphics/HarfbuzzSkia.cpp +++ b/core/jni/android/graphics/HarfbuzzSkia.cpp @@ -89,7 +89,7 @@ static void glyphsToAdvances(HB_Font hbFont, const HB_Glyph* glyphs, hb_uint32 n ALOGD("glyphsToAdvances -- advances[%d]=%d", i, advances[i]); #endif } - delete glyphs16; + delete[] glyphs16; } static HB_Bool canRender(HB_Font hbFont, const HB_UChar16* characters, hb_uint32 length) @@ -107,7 +107,7 @@ static HB_Bool canRender(HB_Font hbFont, const HB_UChar16* characters, hb_uint32 break; } } - delete glyphs16; + delete[] glyphs16; return result; } |