Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d93ef918 authored by Raph Levien's avatar Raph Levien
Browse files

Remove SkFloatToScalar in GLES20Canvas (Minikin) 

A recent Skia change removed the SkFloatToScalar macro, but it was being
used in the Minikin case for the GSES20Canvas (enabled only on
USE_MINIKIN builds). This patch removes it.

Change-Id: Ib64fd347f5db94fa6f3b3f79957d55a38f0328c9
parent 2e465171

core/jni/android_view_GLES20Canvas.cpp

+2 −2
Original line number Diff line number Diff line
@@ -686,8 +686,8 @@ static void renderTextLayout(OpenGLRenderer* renderer, Layout* layout, 
        MinikinFontSkia* mfs = static_cast<MinikinFontSkia *>(layout->getFont(i));

        skFace = mfs->GetSkTypeface();

        glyphs[i] = layout->getGlyphId(i);

        pos[2 * i] = SkFloatToScalar(layout->getX(i));

        pos[2 * i + 1] = SkFloatToScalar(layout->getY(i));

        pos[2 * i] = layout->getX(i);

        pos[2 * i + 1] = layout->getY(i);

        if (i > 0 && skFace != lastFace) {

            paint->setTypeface(lastFace);

            size_t glyphsCount = i - start;