diff options
| author |  benjaminwagner <benjaminwagner@google.com> | 2016-03-24 19:07:58 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-03-24 19:07:58 -0700 |
| commit | 6b3eacb0dfaeb3374d410c8c041bd39cd066e1ea (patch) | |
| tree | 1d113c36bd0c2d0921570823ca665bbef484aaac /src/core/SkTextToPathIter.h | |
| parent | c429baf7a28205a19975cfbb60db1b7bfc9c61fa (diff) | |
Change type of SkGlyph::fAdvance[XY] to float.
BUG=skia:4632
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1737693006
Review URL: https://codereview.chromium.org/1737693006
Diffstat (limited to 'src/core/SkTextToPathIter.h')
| -rw-r--r-- | src/core/SkTextToPathIter.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/SkTextToPathIter.h b/src/core/SkTextToPathIter.h index 435c1c79f0..dcd5a01cd3 100644 --- a/src/core/SkTextToPathIter.h +++ b/src/core/SkTextToPathIter.h @@ -22,7 +22,7 @@ protected: SkGlyphCache* fCache; SkPaint fPaint; SkScalar fScale; - SkFixed fPrevAdvance; + SkScalar fPrevAdvance; const char* fText; const char* fStop; SkPaint::GlyphCacheProc fGlyphCacheProc; @@ -75,7 +75,7 @@ public: && fPaint.getTextAlign() != SkPaint::kLeft_Align) { // need to measure first const char* text = fText; const SkGlyph& glyph = fGlyphCacheProc(fCache, &text); - SkScalar width = SkScalarMul(SkFixedToScalar((&glyph.fAdvanceX)[0]), fScale); + SkScalar width = SkScalarMul(SkFloatToScalar((&glyph.fAdvanceX)[0]), fScale); if (fPaint.getTextAlign() == SkPaint::kCenter_Align) { width = SkScalarHalf(width); } |