From bfa9a824a20f37c2dd7111012b46c929cf2ed8a0 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Tue, 9 Jun 2015 13:24:12 -0700 Subject: Merge to XFA: Use stdint.h types throughout PDFium. Near-automatic merge, plus re-running scripts to update additional usage. R=thestig@chromium.org Review URL: https://codereview.chromium.org/1172793002 --- xfa/src/fxbarcode/BC_UtilCodingConvert.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'xfa/src/fxbarcode/BC_UtilCodingConvert.cpp') diff --git a/xfa/src/fxbarcode/BC_UtilCodingConvert.cpp b/xfa/src/fxbarcode/BC_UtilCodingConvert.cpp index c6aa1f3eb7..440df7c889 100644 --- a/xfa/src/fxbarcode/BC_UtilCodingConvert.cpp +++ b/xfa/src/fxbarcode/BC_UtilCodingConvert.cpp @@ -25,20 +25,20 @@ void CBC_UtilCodingConvert::LocaleToUtf8(const CFX_ByteString &src, CFX_ByteArra { CFX_WideString unicode = CFX_WideString::FromLocal(src, src.GetLength()); CFX_ByteString utf8 = unicode.UTF8Encode(); - for (FX_INT32 i = 0; i < utf8.GetLength(); i ++) { + for (int32_t i = 0; i < utf8.GetLength(); i ++) { dst.Add(utf8[i]); } } void CBC_UtilCodingConvert::Utf8ToLocale(const CFX_ByteArray &src, CFX_ByteString &dst) { CFX_ByteString utf8; - for (FX_INT32 i = 0; i < src.GetSize(); i ++) { + for (int32_t i = 0; i < src.GetSize(); i ++) { utf8 += src[i]; } CFX_WideString unicode = CFX_WideString::FromUTF8(utf8, utf8.GetLength()); dst.ConvertFrom(unicode); } -void CBC_UtilCodingConvert::Utf8ToLocale(const FX_BYTE *src, FX_INT32 count, CFX_ByteString &dst) +void CBC_UtilCodingConvert::Utf8ToLocale(const uint8_t *src, int32_t count, CFX_ByteString &dst) { CFX_WideString unicode = CFX_WideString::FromUTF8((const char*)src, count); dst.ConvertFrom(unicode); -- cgit v1.2.3