diff options
| author | Leon Scroggins III <scroggo@google.com> | 2014-05-15 10:52:56 -0400 |
|---|---|---|
| committer | Leon Scroggins III <scroggo@google.com> | 2014-05-15 10:52:56 -0400 |
| commit | a3998d4f51e862f00b3dc6b8b99cfbeea2622b2d (patch) | |
| tree | 6f6938e76cc60c2f5fa67ac3ef9a8aa5b7829f39 | |
| parent | d231a4b0b1d482c7ae7717b048112e1fe5d0f5a9 (diff) | |
| download | android_frameworks_minikin-a3998d4f51e862f00b3dc6b8b99cfbeea2622b2d.tar.gz android_frameworks_minikin-a3998d4f51e862f00b3dc6b8b99cfbeea2622b2d.tar.bz2 android_frameworks_minikin-a3998d4f51e862f00b3dc6b8b99cfbeea2622b2d.zip | |
Remove references to SkFloatToScalar.
The macro has been deprecated, now that SkScalar is never fixed point.
Fixes minikin build.
Change-Id: I02838a7fa167c5cf58ad225f3f2f52659495492c
| -rw-r--r-- | sample/example_skia.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sample/example_skia.cpp b/sample/example_skia.cpp index ff13b5c..e686621 100644 --- a/sample/example_skia.cpp +++ b/sample/example_skia.cpp @@ -92,8 +92,8 @@ void drawToSkia(SkCanvas *canvas, SkPaint *paint, Layout *layout, float x, float MinikinFontSkia *mfs = static_cast<MinikinFontSkia *>(layout->getFont(i)); skFace = mfs->GetSkTypeface(); glyphs[i] = layout->getGlyphId(i); - pos[i].fX = SkFloatToScalar(x + layout->getX(i)); - pos[i].fY = SkFloatToScalar(y + layout->getY(i)); + pos[i].fX = x + layout->getX(i); + pos[i].fY = y + layout->getY(i); if (i > 0 && skFace != lastFace) { paint->setTypeface(lastFace); canvas->drawPosText(glyphs + start, (i - start) << 1, pos + start, *paint); |