diff options
| author | Raph Levien <raph@google.com> | 2014-08-27 16:24:13 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-08-27 16:24:14 +0000 |
| commit | 2a5fab9d476f434818ba67d2b8b77208e881f0c1 (patch) | |
| tree | 49349fcf2b04f05ec69211d8387f61b0bf121128 /core/jni | |
| parent | fc2497fe0085ecf9c3195c7112141271891dd92a (diff) | |
| parent | 531dab6d3a2ffcd13684367659dfd0296f86cfe5 (diff) | |
| download | frameworks_base-2a5fab9d476f434818ba67d2b8b77208e881f0c1.zip frameworks_base-2a5fab9d476f434818ba67d2b8b77208e881f0c1.tar.gz frameworks_base-2a5fab9d476f434818ba67d2b8b77208e881f0c1.tar.bz2 | |
Merge "Fix incorrect return value on missing glyph" into lmp-dev
Diffstat (limited to 'core/jni')
| -rw-r--r-- | core/jni/android/graphics/MinikinSkia.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/jni/android/graphics/MinikinSkia.cpp b/core/jni/android/graphics/MinikinSkia.cpp index ae29014..4649b07 100644 --- a/core/jni/android/graphics/MinikinSkia.cpp +++ b/core/jni/android/graphics/MinikinSkia.cpp @@ -39,7 +39,7 @@ bool MinikinFontSkia::GetGlyph(uint32_t codepoint, uint32_t *glyph) const { uint16_t glyph16; paint.textToGlyphs(&codepoint, sizeof(codepoint), &glyph16); *glyph = glyph16; - return !!glyph; + return !!glyph16; } static void MinikinFontSkia_SetSkiaPaint(const MinikinFont* font, SkPaint* skPaint, const MinikinPaint& paint) { |