AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[PDF] Use SkTypeface::countGlyphs instead of getAdvancedTypefaceMetrics

Browse Source 
BUG=1088
R=bungeman@google.com

Author: vandebo@chromium.org

Review URL: https://chromiumcodereview.appspot.com/18886005

git-svn-id: http://skia.googlecode.com/svn/trunk@10063 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
commit-bot@chromium.org 2013-07-13 17:24:30 +00:00
parent 42dacab4e7
commit 000e13ef16
1 changed files with 1 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/pdf/SkPDFDevice.cpp
View File

@ -105,18 +105,7 @@ static void align_text(SkDrawCacheProc glyphCacheProc, const SkPaint& paint,
static size_t max_glyphid_for_typeface(SkTypeface* typeface) {
SkAutoResolveDefaultTypeface autoResolve(typeface);
typeface = autoResolve.get();
SkAdvancedTypefaceMetrics* metrics;
metrics = typeface->getAdvancedTypefaceMetrics(
SkAdvancedTypefaceMetrics::kNo_PerGlyphInfo,
NULL, 0);
int lastGlyphID = 0;
if (metrics) {
lastGlyphID = metrics->fLastGlyphID;
metrics->unref();
}
return lastGlyphID;
return typeface->countGlyphs() - 1;
}
typedef SkAutoSTMalloc<128, uint16_t> SkGlyphStorage;