aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/ports/SkFontHost_win_dw.cpp
diff options
context:
space:
mode:
authorGravatar bungeman@google.com <bungeman@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-08-28 03:16:02 +0000
committerGravatar bungeman@google.com <bungeman@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-08-28 03:16:02 +0000
commit7687578d3a42b528f536c2f3437104fac04c4ae4 (patch)
tree203ceb7d31497dd00130c6c8f49632b3f90b2b6a /src/ports/SkFontHost_win_dw.cpp
parent81d8dacbce4d73c8b0715cde7b63594a8f8f27a4 (diff)
Fix for 10963: Use mx instead of my where mx is wanted.
git-svn-id: http://skia.googlecode.com/svn/trunk@10966 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/ports/SkFontHost_win_dw.cpp')
-rw-r--r--src/ports/SkFontHost_win_dw.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/ports/SkFontHost_win_dw.cpp b/src/ports/SkFontHost_win_dw.cpp
index 52b2fee107..41a06f1ece 100644
--- a/src/ports/SkFontHost_win_dw.cpp
+++ b/src/ports/SkFontHost_win_dw.cpp
@@ -920,12 +920,12 @@ void SkScalerContext_DW::generateFontMetrics(SkPaint::FontMetrics* mx,
SkScalar upem = SkIntToScalar(dwfm.designUnitsPerEm);
if (mx) {
- my->fTop = -fRec.fTextSize * SkIntToScalar(dwfm.ascent) / upem;
- my->fAscent = my->fTop;
- my->fDescent = fRec.fTextSize * SkIntToScalar(dwfm.descent) / upem;
- my->fBottom = my->fDescent;
- my->fLeading = fRec.fTextSize * SkIntToScalar(dwfm.lineGap) / upem;
- my->fXHeight = fRec.fTextSize * SkIntToScalar(dwfm.xHeight) / upem;
+ mx->fTop = -fRec.fTextSize * SkIntToScalar(dwfm.ascent) / upem;
+ mx->fAscent = mx->fTop;
+ mx->fDescent = fRec.fTextSize * SkIntToScalar(dwfm.descent) / upem;
+ mx->fBottom = mx->fDescent;
+ mx->fLeading = fRec.fTextSize * SkIntToScalar(dwfm.lineGap) / upem;
+ mx->fXHeight = fRec.fTextSize * SkIntToScalar(dwfm.xHeight) / upem;
}
if (my) {