Index: src/fonts/SkGScalerContext.cpp |
diff --git a/src/fonts/SkGScalerContext.cpp b/src/fonts/SkGScalerContext.cpp |
index d2d0cacd0e1d25791fb2b28f7fa001101f2a1f27..9766e34ff07b33289a0a1c1054d628650d0e1919 100644 |
--- a/src/fonts/SkGScalerContext.cpp |
+++ b/src/fonts/SkGScalerContext.cpp |
@@ -77,20 +77,20 @@ void SkGScalerContext::generateAdvance(SkGlyph* glyph) { |
fProxy->getAdvance(glyph); |
SkVector advance; |
- fMatrix.mapXY(SkFixedToScalar(glyph->fAdvanceX), |
- SkFixedToScalar(glyph->fAdvanceY), &advance); |
- glyph->fAdvanceX = SkScalarToFixed(advance.fX); |
- glyph->fAdvanceY = SkScalarToFixed(advance.fY); |
+ fMatrix.mapXY(SkFloatToScalar(glyph->fAdvanceX), |
+ SkFloatToScalar(glyph->fAdvanceY), &advance); |
+ glyph->fAdvanceX = SkScalarToFloat(advance.fX); |
+ glyph->fAdvanceY = SkScalarToFloat(advance.fY); |
} |
void SkGScalerContext::generateMetrics(SkGlyph* glyph) { |
fProxy->getMetrics(glyph); |
SkVector advance; |
- fMatrix.mapXY(SkFixedToScalar(glyph->fAdvanceX), |
- SkFixedToScalar(glyph->fAdvanceY), &advance); |
- glyph->fAdvanceX = SkScalarToFixed(advance.fX); |
- glyph->fAdvanceY = SkScalarToFixed(advance.fY); |
+ fMatrix.mapXY(SkFloatToScalar(glyph->fAdvanceX), |
+ SkFloatToScalar(glyph->fAdvanceY), &advance); |
+ glyph->fAdvanceX = SkScalarToFloat(advance.fX); |
+ glyph->fAdvanceY = SkScalarToFloat(advance.fY); |
SkPath path; |
fProxy->getPath(*glyph, &path); |