diff options
Diffstat (limited to 'gm')
| -rw-r--r-- | gm/atlastext.cpp | 2 | ||||
| -rw-r--r-- | gm/coloremoji_blendmodes.cpp | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/gm/atlastext.cpp b/gm/atlastext.cpp index 859b4c356f..e3fed2ee06 100644 --- a/gm/atlastext.cpp +++ b/gm/atlastext.cpp @@ -30,7 +30,7 @@ static SkScalar draw_string(SkAtlasTextTarget* target, const SkString& text, SkS return x; } auto font = SkAtlasTextFont::Make(typeface, size); - int cnt = SkUTF8_CountUnichars(text.c_str(), text.size()); + int cnt = SkUTF::CountUTF8(text.c_str(), text.size()); std::unique_ptr<SkGlyphID[]> glyphs(new SkGlyphID[cnt]); typeface->charsToGlyphs(text.c_str(), SkTypeface::Encoding::kUTF8_Encoding, glyphs.get(), cnt); diff --git a/gm/coloremoji_blendmodes.cpp b/gm/coloremoji_blendmodes.cpp index 872527404c..46ba67ec90 100644 --- a/gm/coloremoji_blendmodes.cpp +++ b/gm/coloremoji_blendmodes.cpp @@ -148,7 +148,8 @@ protected: textP.setBlendMode(gModes[i]); textP.setTextEncoding(SkPaint::kUTF32_TextEncoding); const char* text = sk_tool_utils::emoji_sample_text(); - SkUnichar unichar = SkUTF8_NextUnichar(&text, text + strlen(text)); + SkUnichar unichar = SkUTF::NextUTF8(&text, text + strlen(text)); + SkASSERT(unichar >= 0); canvas->drawText(&unichar, 4, x+ w/10.f, y + 7.f*h/8.f, textP); } #if 1 |