diff options
| author |  Hal Canary <halcanary@google.com> | 2018-07-24 11:33:21 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-07-25 17:21:56 +0000 |
| commit | 4014ba6ec7a7825495ac0a6ed591c5dadd30751d (patch) | |
| tree | 7439f79dce6e1768d7cdf3e36d4952fd9ed8ef1b /gm | |
| parent | ba5c439809fb2be3b1db159b29aeffaa39f786df (diff) | |
SkUtils: remove some versions of UTF routines.
Change-Id: Ib1f776ae472117c23d2145253adf25fceb412b32
Reviewed-on: https://skia-review.googlesource.com/143111
Reviewed-by: Herb Derby <herb@google.com>
Commit-Queue: Hal Canary <halcanary@google.com>
Diffstat (limited to 'gm')
| -rw-r--r-- | gm/atlastext.cpp | 2 | ||||
| -rw-r--r-- | gm/coloremoji_blendmodes.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/gm/atlastext.cpp b/gm/atlastext.cpp index c30a6754db..859b4c356f 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()); + int cnt = SkUTF8_CountUnichars(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 1e1608d648..872527404c 100644 --- a/gm/coloremoji_blendmodes.cpp +++ b/gm/coloremoji_blendmodes.cpp @@ -148,7 +148,7 @@ protected: textP.setBlendMode(gModes[i]); textP.setTextEncoding(SkPaint::kUTF32_TextEncoding); const char* text = sk_tool_utils::emoji_sample_text(); - SkUnichar unichar = SkUTF8_ToUnichar(text); + SkUnichar unichar = SkUTF8_NextUnichar(&text, text + strlen(text)); canvas->drawText(&unichar, 4, x+ w/10.f, y + 7.f*h/8.f, textP); } #if 1 |