| Index: xfa/fxbarcode/BC_UtilCodingConvert.cpp
|
| diff --git a/xfa/fxbarcode/BC_UtilCodingConvert.cpp b/xfa/fxbarcode/BC_UtilCodingConvert.cpp
|
| index 8421e280f3b6500d9afbddbfbed232a64e95652c..79311691e2f192b4d54ed223c5929e43a1cc20ae 100644
|
| --- a/xfa/fxbarcode/BC_UtilCodingConvert.cpp
|
| +++ b/xfa/fxbarcode/BC_UtilCodingConvert.cpp
|
| @@ -36,14 +36,15 @@ void CBC_UtilCodingConvert::Utf8ToLocale(const CFX_ByteArray& src,
|
| for (int32_t i = 0; i < src.GetSize(); i++) {
|
| utf8 += src[i];
|
| }
|
| - CFX_WideString unicode = CFX_WideString::FromUTF8(utf8, utf8.GetLength());
|
| + CFX_WideString unicode = CFX_WideString::FromUTF8(utf8.AsByteStringC());
|
| dst = CFX_ByteString::FromUnicode(unicode);
|
| }
|
|
|
| void CBC_UtilCodingConvert::Utf8ToLocale(const uint8_t* src,
|
| int32_t count,
|
| CFX_ByteString& dst) {
|
| - CFX_WideString unicode = CFX_WideString::FromUTF8((const char*)src, count);
|
| + CFX_WideString unicode =
|
| + CFX_WideString::FromUTF8(CFX_ByteStringC(src, count));
|
| dst = CFX_ByteString::FromUnicode(unicode);
|
| }
|
|
|
|
|