aboutsummaryrefslogtreecommitdiffhomepage
path: root/tools
diff options
context:
space:
mode:
authorGravatar Brian Salomon <bsalomon@google.com>2017-11-20 13:13:01 -0500
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2017-11-20 18:33:38 +0000
commit0c1c2b39dd93100542236b23546ed0b855816a49 (patch)
tree2f84e885f100bab54a5dc60c5565a639fa12b8d5 /tools
parent999ec57291dc7cf1d8e3a745627670e6cadc1c12 (diff)
Make SkAtlasTextTarget use glyph IDs
Bug: skia: Change-Id: Idefd69f02f62fea22c41a3476676773221c3ae81 Reviewed-on: https://skia-review.googlesource.com/73700 Reviewed-by: Ben Wagner <bungeman@google.com> Commit-Queue: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'tools')
-rw-r--r--tools/SkTestScalerContext.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/tools/SkTestScalerContext.cpp b/tools/SkTestScalerContext.cpp
index 7797ebfa20..f74b1bd57a 100644
--- a/tools/SkTestScalerContext.cpp
+++ b/tools/SkTestScalerContext.cpp
@@ -151,7 +151,9 @@ int SkTestTypeface::onCharsToGlyphs(const void* chars, Encoding encoding,
case kUTF16_Encoding: ch = SkUTF16_NextUnichar(&utf16); break;
case kUTF32_Encoding: ch = *utf32++; break;
}
- glyphs[i] = fTestFont->codeToIndex(ch);
+ if (glyphs) {
+ glyphs[i] = fTestFont->codeToIndex(ch);
+ }
}
return glyphCount;
}