commit 0f9d33ef06980133cc747a7b51e9a4f65a785077
author Mike Reed <reed@google.com> Wed Dec 05 10:54:05 2018 -0500
committer Mike Reed <reed@google.com> Wed Dec 05 17:42:33 2018 +0000
tree 2efbe5c6ee9e35ce52443736d5392d41283c71e3
parent 8afaa1ef2dbcec0b6145d81f287a0abf74d22a96

clean up conditional code for SkTextEncoding

Bug: skia:
Change-Id: I1e57a14b360d92651d4b41bc01891381431c8c4a
Reviewed-on: https://skia-review.googlesource.com/c/174583
Reviewed-by: Florin Malita <fmalita@chromium.org>

tools/sk_tool_utils.cpp

diff --git a/tools/sk_tool_utils.cpp b/tools/sk_tool_utils.cpp
index 35c059f..ba9bd7c 100644
--- a/tools/sk_tool_utils.cpp
+++ b/tools/sk_tool_utils.cpp
@@ -140,8 +140,8 @@
     SkFont font = SkFont::LEGACY_ExtractFromPaint(paint);
     SkTDArray<uint16_t> glyphs;
 
-    glyphs.append(font.countText(text, len, (SkTextEncoding)paint.getTextEncoding()));
-    font.textToGlyphs(text, len, (SkTextEncoding)paint.getTextEncoding(), glyphs.begin(), glyphs.count());
+    glyphs.append(font.countText(text, len, paint.getTextEncoding()));
+    font.textToGlyphs(text, len, paint.getTextEncoding(), glyphs.begin(), glyphs.count());
 
     const SkTextBlobBuilder::RunBuffer& run = builder->allocRun(font, glyphs.count(), x, y,
                                                                 nullptr);