aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar caryclark <caryclark@google.com>2015-06-11 10:09:06 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2015-06-11 10:09:06 -0700
commit8d0d2b8577bcfe329197286afbd3a01fd5d799c0 (patch)
tree68932d663ed238d20efa409d81da02d3f9a49fb8
parent6d0d6cbb3e5767510550186178b83e98c64394e5 (diff)
remove duplicate assign of fLastGlyphID
Hal found a brain-dead bug on my part. Thanks Hal! TBR=halcanary@google.com Review URL: https://codereview.chromium.org/1176423003
-rw-r--r--src/fonts/SkTestScalerContext.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/fonts/SkTestScalerContext.cpp b/src/fonts/SkTestScalerContext.cpp
index 194cd0907c..28b53b3a15 100644
--- a/src/fonts/SkTestScalerContext.cpp
+++ b/src/fonts/SkTestScalerContext.cpp
@@ -148,9 +148,8 @@ SkAdvancedTypefaceMetrics* SkTestTypeface::onGetAdvancedTypefaceMetrics(
info->fFontName.set(fTestFont->fName);
info->fType = SkAdvancedTypefaceMetrics::kOther_Font;
info->fFlags = SkAdvancedTypefaceMetrics::kEmpty_FontFlag;
- info->fLastGlyphID = static_cast<uint16_t>(fTestFont->fCharCodesCount - 1);
- info->fEmSize = 0;
info->fLastGlyphID = SkToU16(onCountGlyphs() - 1);
+ info->fEmSize = 0;
info->fStyle = 0;
info->fItalicAngle = 0;
info->fAscent = 0;