diff options
| author |  ctguil@chromium.org <ctguil@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-03-04 19:39:56 +0000 |
|---|---|---|
| committer | ctguil@chromium.org <ctguil@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2011-03-04 19:39:56 +0000 |
| commit | f7c2c4544f866ae65cd9a4eee4da563f6d653d20 (patch) | |
| tree | 5d3bc36bfb056bc9dd1cc78160a9abca654be9ee /src/core/SkAdvancedTypefaceMetrics.cpp | |
| parent | eca7d34f1d2164ebfb56d5870acca6dceda42c37 (diff) | |
Update windows port of of SkFontHost::GetAdvancedTypefaceMetrics to use calculateGlyphCount.
Review URL: http://codereview.appspot.com/4245060
git-svn-id: http://skia.googlecode.com/svn/trunk@890 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/core/SkAdvancedTypefaceMetrics.cpp')
| -rw-r--r-- | src/core/SkAdvancedTypefaceMetrics.cpp | 5 |
1 files changed, 1 insertions, 4 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) { |