aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar reed <reed@chromium.org>2014-10-29 07:53:24 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2014-10-29 07:53:24 -0700
commitf8c2feffd68b3262f3c039ec1bd517c5f6cc9e4c (patch)
treee1fb657f6ae07af9873e017963c227eaa5963c35
parentaf58b5fcba23f5cc395ad64642b46504bd181eac (diff)
scale xmin/xmax etc in fontmetrics
-rw-r--r--src/ports/SkFontHost_FreeType.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/ports/SkFontHost_FreeType.cpp b/src/ports/SkFontHost_FreeType.cpp
index 9acabbb5c2..b429f592e1 100644
--- a/src/ports/SkFontHost_FreeType.cpp
+++ b/src/ports/SkFontHost_FreeType.cpp
@@ -1495,10 +1495,10 @@ void SkScalerContext_FreeType::generateFontMetrics(SkPaint::FontMetrics* metrics
metrics->fBottom = ymin * scale;
metrics->fLeading = leading * scale;
metrics->fAvgCharWidth = avgCharWidth * scale;
- metrics->fXMin = xmin;
- metrics->fXMax = xmax;
- metrics->fXHeight = x_height;
- metrics->fCapHeight = cap_height;
+ metrics->fXMin = xmin * scale;
+ metrics->fXMax = xmax * scale;
+ metrics->fXHeight = x_height * scale;
+ metrics->fCapHeight = cap_height * scale;
metrics->fUnderlineThickness = underlineThickness * scale;
metrics->fUnderlinePosition = underlinePosition * scale;
}