diff options
Diffstat (limited to 'src/pdf')
| -rw-r--r-- | src/pdf/SkPDFDevice.cpp | 4 | ||||
| -rw-r--r-- | src/pdf/SkPDFMetadata.cpp | 8 | ||||
| -rw-r--r-- | src/pdf/SkPDFUtils.h | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/pdf/SkPDFDevice.cpp b/src/pdf/SkPDFDevice.cpp index 9cd2892a05..fc7384f7c0 100644 --- a/src/pdf/SkPDFDevice.cpp +++ b/src/pdf/SkPDFDevice.cpp @@ -1274,7 +1274,7 @@ void SkPDFDevice::internalDrawGlyphRun(const SkGlyphRun& glyphRun, SkPoint offse // Check if `/ActualText` needed. const char* textPtr = c.fUtf8Text; const char* textEnd = c.fUtf8Text + c.fTextByteLength; - SkUnichar unichar = SkUTF8_NextUnicharWithError(&textPtr, textEnd); + SkUnichar unichar = SkUTF::NextUTF8(&textPtr, textEnd); if (unichar < 0) { return; } @@ -1288,7 +1288,7 @@ void SkPDFDevice::internalDrawGlyphRun(const SkGlyphRun& glyphRun, SkPoint offse // the BOM marks this text as UTF-16BE, not PDFDocEncoding. SkPDFUtils::WriteUTF16beHex(out, unichar); // first char while (textPtr < textEnd) { - unichar = SkUTF8_NextUnicharWithError(&textPtr, textEnd); + unichar = SkUTF::NextUTF8(&textPtr, textEnd); if (unichar < 0) { break; } diff --git a/src/pdf/SkPDFMetadata.cpp b/src/pdf/SkPDFMetadata.cpp index 9234f44ac1..16e6637c7d 100644 --- a/src/pdf/SkPDFMetadata.cpp +++ b/src/pdf/SkPDFMetadata.cpp @@ -62,22 +62,22 @@ static SkString to_utf16be(const char* src, size_t len) { const char* const end = src + len; size_t n = 1; // BOM for (const char* ptr = src; ptr < end;) { - SkUnichar u = SkUTF8_NextUnicharWithError(&ptr, end); + SkUnichar u = SkUTF::NextUTF8(&ptr, end); if (u < 0) { break; } - n += SkUTF16_FromUnichar(u); + n += SkUTF::ToUTF16(u); } ret.resize(2 * n); char* out = ret.writable_str(); write_utf16be(&out, 0xFEFF); // BOM for (const char* ptr = src; ptr < end;) { - SkUnichar u = SkUTF8_NextUnicharWithError(&ptr, end); + SkUnichar u = SkUTF::NextUTF8(&ptr, end); if (u < 0) { break; } uint16_t utf16[2]; - size_t l = SkUTF16_FromUnichar(u, utf16); + size_t l = SkUTF::ToUTF16(u, utf16); write_utf16be(&out, utf16[0]); if (l == 2) { write_utf16be(&out, utf16[1]); diff --git a/src/pdf/SkPDFUtils.h b/src/pdf/SkPDFUtils.h index a291914a5a..a05b52b113 100644 --- a/src/pdf/SkPDFUtils.h +++ b/src/pdf/SkPDFUtils.h @@ -103,7 +103,7 @@ inline void WriteUInt8(SkDynamicMemoryWStream* wStream, uint8_t value) { inline void WriteUTF16beHex(SkDynamicMemoryWStream* wStream, SkUnichar utf32) { uint16_t utf16[2] = {0, 0}; - size_t len = SkUTF16_FromUnichar(utf32, utf16); + size_t len = SkUTF::ToUTF16(utf32, utf16); SkASSERT(len == 1 || len == 2); SkPDFUtils::WriteUInt16BE(wStream, utf16[0]); if (len == 2) { |