diff options
| author | tsepez <tsepez@chromium.org> | 2016-04-06 10:51:14 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-04-06 10:51:14 -0700 |
| commit | 6fe7d2174a47107578da912299c93b4dfb9f2add (patch) | |
| tree | 4f2d343c477c9a4ec18d25801800eb08d8938dad /xfa/fxbarcode/BC_UtilCodingConvert.cpp | |
| parent | 89bdd0876e6b92c959839908204eb82337a27ba2 (diff) | |
| download | pdfium-6fe7d2174a47107578da912299c93b4dfb9f2add.tar.xz | |
Make CFX_WideString::FromUTF8() take a CFX_ByteStringC argument.
Methods that take string arguments and do not persist them should
take *StringC types as argument rather than discrete ptr/len args.
Avoids a number of implicit casts from CFX_ByteString to char*.
BUG=
Review URL: https://codereview.chromium.org/1861183002
Diffstat (limited to 'xfa/fxbarcode/BC_UtilCodingConvert.cpp')
| -rw-r--r-- | xfa/fxbarcode/BC_UtilCodingConvert.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/xfa/fxbarcode/BC_UtilCodingConvert.cpp b/xfa/fxbarcode/BC_UtilCodingConvert.cpp index 8421e280f3..79311691e2 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); } |