diff options
Diffstat (limited to 'src/core/SkAdvancedTypefaceMetrics.cpp')
| -rw-r--r-- | src/core/SkAdvancedTypefaceMetrics.cpp | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/src/core/SkAdvancedTypefaceMetrics.cpp b/src/core/SkAdvancedTypefaceMetrics.cpp index cff0989e31..f786671c83 100644 --- a/src/core/SkAdvancedTypefaceMetrics.cpp +++ b/src/core/SkAdvancedTypefaceMetrics.cpp @@ -65,8 +65,6 @@ template <typename Data, typename FontHandle> SkAdvancedTypefaceMetrics::AdvanceMetric<Data>* getAdvanceData( FontHandle fontHandle, int num_glyphs, - const uint32_t* subsetGlyphIDs, - uint32_t subsetGlyphIDsLength, bool (*getAdvance)(FontHandle fontHandle, int gId, Data* data)) { // Assuming that an ASCII representation of a width or a glyph id is, // on average, 3 characters long gives the following cut offs for @@ -84,17 +82,10 @@ SkAdvancedTypefaceMetrics::AdvanceMetric<Data>* getAdvanceData( curRange = appendRange(&result, 0); Data lastAdvance = SK_MinS16; int repeats = 0; - uint32_t subsetIndex = 0; for (int gId = 0; gId <= num_glyphs; gId++) { - Data advance = 0; + Data advance; if (gId < num_glyphs) { - // Get glyph id only when subset is NULL, or the id is in subset. - if (!subsetGlyphIDs || - (subsetIndex < subsetGlyphIDsLength && - static_cast<uint32_t>(gId) == subsetGlyphIDs[subsetIndex])) { - SkAssertResult(getAdvance(fontHandle, gId, &advance)); - ++subsetIndex; - } + SkAssertResult(getAdvance(fontHandle, gId, &advance)); } else { advance = SK_MinS16; } @@ -148,22 +139,16 @@ SkAdvancedTypefaceMetrics::AdvanceMetric<Data>* getAdvanceData( template SkAdvancedTypefaceMetrics::WidthRange* getAdvanceData( HDC hdc, int num_glyphs, - const uint32_t* subsetGlyphIDs, - uint32_t subsetGlyphIDsLength, bool (*getAdvance)(HDC hdc, int gId, int16_t* data)); #elif defined(SK_BUILD_FOR_UNIX) template SkAdvancedTypefaceMetrics::WidthRange* getAdvanceData( FT_Face face, int num_glyphs, - const uint32_t* subsetGlyphIDs, - uint32_t subsetGlyphIDsLength, bool (*getAdvance)(FT_Face face, int gId, int16_t* data)); #elif defined(SK_BUILD_FOR_MAC) || defined(SK_BUILD_FOR_IOS) template SkAdvancedTypefaceMetrics::WidthRange* getAdvanceData( CTFontRef ctFont, int num_glyphs, - const uint32_t* subsetGlyphIDs, - uint32_t subsetGlyphIDsLength, bool (*getAdvance)(CTFontRef ctFont, int gId, int16_t* data)); #endif template void resetRange( |