| Index: src/core/SkPaint.cpp
|
| diff --git a/src/core/SkPaint.cpp b/src/core/SkPaint.cpp
|
| index b18ffa65a79c18badf49e9efd6cbf611d24d8385..f40aeff727afe73551bfe0275bf04d22e143371a 100644
|
| --- a/src/core/SkPaint.cpp
|
| +++ b/src/core/SkPaint.cpp
|
| @@ -519,8 +519,7 @@ bool SkPaint::containsText(const void* textData, size_t byteLength) const {
|
| return true;
|
| }
|
|
|
| -void SkPaint::glyphsToUnichars(const uint16_t glyphs[], int count,
|
| - SkUnichar textData[]) const {
|
| +void SkPaint::glyphsToUnichars(const uint16_t glyphs[], int count, SkUnichar textData[]) const {
|
| if (count <= 0) {
|
| return;
|
| }
|
| @@ -528,7 +527,8 @@ void SkPaint::glyphsToUnichars(const uint16_t glyphs[], int count,
|
| SkASSERT(glyphs != NULL);
|
| SkASSERT(textData != NULL);
|
|
|
| - SkAutoGlyphCache autoCache(*this, NULL, NULL);
|
| + SkSurfaceProps props(0, kUnknown_SkPixelGeometry);
|
| + SkAutoGlyphCache autoCache(*this, &props, NULL);
|
| SkGlyphCache* cache = autoCache.getCache();
|
|
|
| for (int index = 0; index < count; index++) {
|
|
|