diff options
| author |  Hal Canary <halcanary@google.com> | 2017-01-11 13:26:43 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-01-11 19:09:01 +0000 |
| commit | 58d2a72afad28a991f5dead5e5275b2fdca40607 (patch) | |
| tree | 70c004acbf7995f8592931df46a9e28ac2f376f4 /src/fonts | |
| parent | 95e3c058ef633782f7549e9e1c2727d60dbc8ee5 (diff) | |
SkTestTypeface: correct encoding
Change-Id: I6ef875fc44278b873989d323dd26f6ed26b68f28
Reviewed-on: https://skia-review.googlesource.com/6889
Commit-Queue: Hal Canary <halcanary@google.com>
Reviewed-by: Cary Clark <caryclark@google.com>
Diffstat (limited to 'src/fonts')
| -rw-r--r-- | src/fonts/SkTestScalerContext.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/fonts/SkTestScalerContext.cpp b/src/fonts/SkTestScalerContext.cpp index d84571d310..fce249feb9 100644 --- a/src/fonts/SkTestScalerContext.cpp +++ b/src/fonts/SkTestScalerContext.cpp @@ -171,8 +171,8 @@ void SkTestTypeface::onGetFontDescriptor(SkFontDescriptor* desc, bool* isLocal) } int SkTestTypeface::onCharsToGlyphs(const void* chars, Encoding encoding, - uint16_t glyphs[], int glyphCount) const { - SkASSERT(encoding == kUTF16_Encoding); + uint16_t glyphs[], int glyphCount) const { + SkASSERT(encoding == kUTF32_Encoding); for (int index = 0; index < glyphCount; ++index) { SkUnichar ch = ((SkUnichar*) chars)[index]; glyphs[index] = fTestFont->codeToIndex(ch); @@ -214,7 +214,7 @@ protected: uint16_t generateCharToGlyph(SkUnichar uni) override { uint16_t glyph; (void) this->getTestTypeface()->onCharsToGlyphs((const void *) &uni, - SkTypeface::kUTF16_Encoding, &glyph, 1); + SkTypeface::kUTF32_Encoding, &glyph, 1); return glyph; } |