| commit | d41e70de196e78e21e1001d23a7259785cbd0835 | [log] [tgz] |
|---|---|---|
| author | vandebo@chromium.org <vandebo@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | Thu Mar 08 19:41:01 2012 +0000 |
| committer | vandebo@chromium.org <vandebo@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | Thu Mar 08 19:41:01 2012 +0000 |
| tree | 66c68f2cc34af8fcba254357743cdcb3a776bdaf | |
| parent | f4f2b8010a6e733f0ecbacef4a3ede570dca883a [diff] |
[PDF] Treat TTF Fonts that report zero glyphs as other font type. Fix crbug.com/117322 crash Patch from Arthur Hsu, Original CL: http://codereview.appspot.com/5786057/ Review URL: https://codereview.appspot.com/5792050 git-svn-id: http://skia.googlecode.com/svn/trunk@3345 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/src/ports/SkFontHost_win.cpp b/src/ports/SkFontHost_win.cpp index ec7e1b0..72c311b 100755 --- a/src/ports/SkFontHost_win.cpp +++ b/src/ports/SkFontHost_win.cpp
@@ -1100,7 +1100,8 @@ populate_glyph_to_unicode(hdc, glyphCount, &(info->fGlyphToUnicode)); } - if (otm.otmTextMetrics.tmPitchAndFamily & TMPF_TRUETYPE) { + if (glyphCount > 0 && + (otm.otmTextMetrics.tmPitchAndFamily & TMPF_TRUETYPE)) { info->fType = SkAdvancedTypefaceMetrics::kTrueType_Font; } else { info->fType = SkAdvancedTypefaceMetrics::kOther_Font;