From 6a81b8a282dd388044c433a4c2d8e549e7402d01 Mon Sep 17 00:00:00 2001 From: "vandebo@chromium.org" Date: Fri, 2 Mar 2012 21:11:54 +0000 Subject: [PATCH] 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 --- src/ports/SkFontHost_mac_coretext.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/ports/SkFontHost_mac_coretext.cpp b/src/ports/SkFontHost_mac_coretext.cpp index c5ac27e..a612555 100644 --- a/src/ports/SkFontHost_mac_coretext.cpp +++ b/src/ports/SkFontHost_mac_coretext.cpp @@ -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; -- 2.7.4