Merge "Fix incorrect return value on missing glyph" into lmp-dev

2014-08-27 16:24:13 +00:00
parent fc2497fe00 531dab6d3a
commit 2a5fab9d47
1 changed files with 1 additions and 1 deletions
--- 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) {