diff options
| author |  edisonn@google.com <edisonn@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-01-23 20:12:31 +0000 |
|---|---|---|
| committer | edisonn@google.com <edisonn@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-01-23 20:12:31 +0000 |
| commit | f91c63e116fda7385d9265a00d3302f46baf25c2 (patch) | |
| tree | cca45ecc04f34a83df454b5fecc635e6cee0dc77 /src | |
| parent | ca43208e4aaac817fbc8265542f995f24a3fb7bf (diff) | |
Revert r7341
git-svn-id: http://skia.googlecode.com/svn/trunk@7347 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/SkAdvancedTypefaceMetrics.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/core/SkAdvancedTypefaceMetrics.cpp b/src/core/SkAdvancedTypefaceMetrics.cpp index 4982117f05..b647ada260 100644 --- a/src/core/SkAdvancedTypefaceMetrics.cpp +++ b/src/core/SkAdvancedTypefaceMetrics.cpp @@ -174,9 +174,7 @@ SkAdvancedTypefaceMetrics::AdvanceMetric<Data>* getAdvanceData( if (!subsetGlyphIDs || (subsetIndex < subsetGlyphIDsLength && static_cast<uint32_t>(gId) == subsetGlyphIDs[subsetIndex])) { - if (!getAdvance(fontHandle, gId, &advance)) { - advance = kDontCareAdvance; - } + SkAssertResult(getAdvance(fontHandle, gId, &advance)); ++subsetIndex; } else { advance = kDontCareAdvance; |