diff options
| author | Behdad Esfahbod <behdad@google.com> | 2014-07-29 20:45:55 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-07-24 15:36:21 +0000 |
| commit | a3aa943b865077123352a9309c9af28af8bb0347 (patch) | |
| tree | fc8ac4bcc55b1216addbe915dec8e5edf45b9d45 /libs/minikin/Layout.cpp | |
| parent | 09f1901d6befcab49ed46cb77151a5d4af14a3b9 (diff) | |
| parent | 75d33a31f661d9eb98f3d1b4ac180ed5a9dec014 (diff) | |
| download | android_frameworks_minikin-a3aa943b865077123352a9309c9af28af8bb0347.tar.gz android_frameworks_minikin-a3aa943b865077123352a9309c9af28af8bb0347.tar.bz2 android_frameworks_minikin-a3aa943b865077123352a9309c9af28af8bb0347.zip | |
Merge "Revert "Don't pass invalid Unicode codepoint to Skia""
Diffstat (limited to 'libs/minikin/Layout.cpp')
| -rw-r--r-- | libs/minikin/Layout.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/libs/minikin/Layout.cpp b/libs/minikin/Layout.cpp index 2a396dc..7468780 100644 --- a/libs/minikin/Layout.cpp +++ b/libs/minikin/Layout.cpp @@ -261,12 +261,6 @@ static hb_bool_t harfbuzzGetGlyph(hb_font_t* hbFont, void* fontData, hb_codepoin MinikinPaint* paint = reinterpret_cast<MinikinPaint*>(fontData); MinikinFont* font = paint->font; uint32_t glyph_id; - /* HarfBuzz replaces broken input codepoints with (unsigned int) -1. - * Skia expects valid Unicode. - * Replace invalid codepoints with U+FFFD REPLACEMENT CHARACTER. - */ - if (unicode > 0x10FFFF) - unicode = 0xFFFD; bool ok = font->GetGlyph(unicode, &glyph_id); if (ok) { *glyph = glyph_id; |