| Index: core/fpdfapi/fpdf_font/fpdf_font.cpp | 
| diff --git a/core/fpdfapi/fpdf_font/fpdf_font.cpp b/core/fpdfapi/fpdf_font/fpdf_font.cpp | 
| index ce2390ec083f37c28435487f5b0a97cc20473e1c..aff2b7296020bcc92a9e2f819b0a36df8f66f18c 100644 | 
| --- a/core/fpdfapi/fpdf_font/fpdf_font.cpp | 
| +++ b/core/fpdfapi/fpdf_font/fpdf_font.cpp | 
| @@ -233,9 +233,9 @@ void CPDF_ToUnicodeMap::Load(CPDF_Stream* pStream) { | 
| break; | 
| } | 
| high = parser.GetWord(); | 
| -        uint32_t lowcode = StringToCode(low); | 
| -        uint32_t highcode = | 
| -            (lowcode & 0xffffff00) | (StringToCode(high) & 0xff); | 
| +        uint32_t lowcode = StringToCode(low.AsByteStringC()); | 
| +        uint32_t highcode = (lowcode & 0xffffff00) | | 
| +                            (StringToCode(high.AsByteStringC()) & 0xff); | 
| if (highcode == (uint32_t)-1) { | 
| break; | 
| } | 
| @@ -243,7 +243,7 @@ void CPDF_ToUnicodeMap::Load(CPDF_Stream* pStream) { | 
| if (start == "[") { | 
| for (uint32_t code = lowcode; code <= highcode; code++) { | 
| CFX_ByteString dest = parser.GetWord(); | 
| -            CFX_WideString destcode = StringToWideString(dest); | 
| +            CFX_WideString destcode = StringToWideString(dest.AsByteStringC()); | 
| int len = destcode.GetLength(); | 
| if (len == 0) { | 
| continue; | 
| @@ -258,11 +258,11 @@ void CPDF_ToUnicodeMap::Load(CPDF_Stream* pStream) { | 
| } | 
| parser.GetWord(); | 
| } else { | 
| -          CFX_WideString destcode = StringToWideString(start); | 
| +          CFX_WideString destcode = StringToWideString(start.AsByteStringC()); | 
| int len = destcode.GetLength(); | 
| uint32_t value = 0; | 
| if (len == 1) { | 
| -            value = StringToCode(start); | 
| +            value = StringToCode(start.AsByteStringC()); | 
| for (uint32_t code = lowcode; code <= highcode; code++) { | 
| m_Map[code] = value++; | 
| } | 
|  |