Remove references to SkFloatToScalar.

The macro has been deprecated, now that SkScalar is never fixed point.

Fixes minikin build.

Change-Id: I02838a7fa167c5cf58ad225f3f2f52659495492c
This commit is contained in:
Leon Scroggins III
2014-05-15 10:52:56 -04:00
parent 686d245a0f
commit 521c14790b

View File

@@ -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);