diff options
| -rw-r--r-- | src/core/SkAdvancedTypefaceMetrics.cpp | 5 | ||||
| -rw-r--r-- | src/ports/SkFontHost_win.cpp | 14 |
2 files changed, 4 insertions, 15 deletions
diff --git a/src/core/SkAdvancedTypefaceMetrics.cpp b/src/core/SkAdvancedTypefaceMetrics.cpp index 0c5ad8db29..731478b8b1 100644 --- a/src/core/SkAdvancedTypefaceMetrics.cpp +++ b/src/core/SkAdvancedTypefaceMetrics.cpp @@ -80,10 +80,7 @@ SkAdvancedTypefaceMetrics::AdvanceMetric<Data>* getAdvanceData( int repeats = 0; for (int gId = 0; gId < num_glyphs; gId++) { Data advance; - if (!getAdvance(fontHandle, gId, &advance)) { - num_glyphs = (gId > 0) ? gId - 1 : 0; - break; - } + SkAssertResult(getAdvance(fontHandle, gId, &advance)); if (advance == lastAdvance) { repeats++; } else if (curRange->fAdvance.count() == repeats + 1) { diff --git a/src/ports/SkFontHost_win.cpp b/src/ports/SkFontHost_win.cpp index 04a50cb751..bf658272fd 100644 --- a/src/ports/SkFontHost_win.cpp +++ b/src/ports/SkFontHost_win.cpp @@ -549,6 +549,7 @@ SkAdvancedTypefaceMetrics* SkFontHost::GetAdvancedTypefaceMetrics( if (!GetOutlineTextMetrics(hdc, sizeof(otm), &otm)) {
goto Error;
}
+ const unsigned glyphCount = calculateGlyphCount(hdc);
info = new SkAdvancedTypefaceMetrics;
#ifdef UNICODE
@@ -573,7 +574,7 @@ SkAdvancedTypefaceMetrics* SkFontHost::GetAdvancedTypefaceMetrics( }
info->fEmSize = otm.otmEMSquare;
info->fMultiMaster = false;
- info->fLastGlyphID = 0;
+ info->fLastGlyphID = SkToU16(glyphCount - 1);
info->fStyle = 0;
// If this bit is clear the font is a fixed pitch font.
@@ -627,16 +628,7 @@ SkAdvancedTypefaceMetrics* SkFontHost::GetAdvancedTypefaceMetrics( info->fType = SkAdvancedTypefaceMetrics::kNotEmbeddable_Font;
} else if (perGlyphInfo) {
info->fGlyphWidths.reset(
- getAdvanceData(hdc, SHRT_MAX, &getWidthAdvance));
-
- // Obtain the last glyph index.
- SkAdvancedTypefaceMetrics::WidthRange* last = info->fGlyphWidths.get();
- if (last) {
- while (last->fNext.get()) {
- last = last->fNext.get();
- }
- info->fLastGlyphID = last->fEndId;
- }
+ getAdvanceData(hdc, glyphCount, &getWidthAdvance));
}
Error:
|