diff options
Diffstat (limited to 'src/ports/SkFontHost_FreeType.cpp')
| -rw-r--r-- | src/ports/SkFontHost_FreeType.cpp | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/src/ports/SkFontHost_FreeType.cpp b/src/ports/SkFontHost_FreeType.cpp index 09390151fb..2894a3d159 100644 --- a/src/ports/SkFontHost_FreeType.cpp +++ b/src/ports/SkFontHost_FreeType.cpp @@ -408,9 +408,7 @@ static void populate_glyph_to_unicode(FT_Face& face, // static SkAdvancedTypefaceMetrics* SkFontHost::GetAdvancedTypefaceMetrics( uint32_t fontID, - SkAdvancedTypefaceMetrics::PerGlyphInfo perGlyphInfo, - const uint32_t* glyphIDs, - uint32_t glyphIDsCount) { + SkAdvancedTypefaceMetrics::PerGlyphInfo perGlyphInfo) { #if defined(SK_BUILD_FOR_MAC) || defined(ANDROID) return NULL; #else @@ -523,7 +521,7 @@ SkAdvancedTypefaceMetrics* SkFontHost::GetAdvancedTypefaceMetrics( info->fBBox = SkIRect::MakeLTRB(face->bbox.xMin, face->bbox.yMax, face->bbox.xMax, face->bbox.yMin); - if (!canEmbed(face) || !FT_IS_SCALABLE(face) || + if (!canEmbed(face) || !FT_IS_SCALABLE(face) || info->fType == SkAdvancedTypefaceMetrics::kOther_Font) { perGlyphInfo = SkAdvancedTypefaceMetrics::kNo_PerGlyphInfo; } @@ -554,11 +552,7 @@ SkAdvancedTypefaceMetrics* SkFontHost::GetAdvancedTypefaceMetrics( SkAdvancedTypefaceMetrics::WidthRange::kRange); } else { info->fGlyphWidths.reset( - getAdvanceData(face, - face->num_glyphs, - glyphIDs, - glyphIDsCount, - &getWidthAdvance)); + getAdvanceData(face, face->num_glyphs, &getWidthAdvance)); } } @@ -594,7 +588,6 @@ SkAdvancedTypefaceMetrics* SkFontHost::GetAdvancedTypefaceMetrics( return info; #endif } - /////////////////////////////////////////////////////////////////////////// static bool bothZero(SkScalar a, SkScalar b) { @@ -629,7 +622,7 @@ void SkFontHost::FilterRec(SkScalerContext::Rec* rec) { // to do subpixel, we must have at most slight hinting h = SkPaint::kSlight_Hinting; } -#ifndef SK_IGNORE_ROTATED_FREETYPE_FIX +#ifndef SK_IGNORE_ROTATED_FREETYPE_FIX // rotated text looks bad with hinting, so we disable it as needed if (!isAxisAligned(*rec)) { h = SkPaint::kNo_Hinting; |