On Mac, also check for a loca table before calling a font true type.

Review URL: https://codereview.appspot.com/5720056

git-svn-id: http://skia.googlecode.com/svn/trunk@3311 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
vandebo@chromium.org 2012-03-02 21:11:54 +00:00
parent 05054f1a78
commit 6a81b8a282

View File

@ -1638,9 +1638,10 @@ SkAdvancedTypefaceMetrics* SkFontHost::GetAdvancedTypefaceMetrics(
info->fStyle = 0;
// If it's not a truetype font, mark it as 'other'. Assume that TrueType
// fonts always have glyf tables. CTFontCopyAttribute() does not always
// fonts always have both glyf and loca tables. At the least, this is what
// sfntly needs to subset the font. CTFontCopyAttribute() does not always
// succeed in determining this directly.
if (!GetTableSize(fontID, 'glyf')) {
if (!GetTableSize(fontID, 'glyf') || !GetTableSize(fontID, 'loca')) {
info->fType = SkAdvancedTypefaceMetrics::kOther_Font;
info->fItalicAngle = 0;
info->fAscent = 0;