Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(31)

Side by Side Diff: xfa/fxbarcode/BC_UtilCodingConvert.cpp

Issue 1861183002: Make CFX_WideString::FromUTF8() take a CFX_ByteStringC argument. (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master
Patch Set: Rebase, combine delcs with initialization. Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « testing/libfuzzer/pdf_xml_fuzzer.cc ('k') | xfa/fxbarcode/cbc_codabar.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 PDFium Authors. All rights reserved. 1 // Copyright 2014 PDFium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com 5 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
6 6
7 #include "xfa/fxbarcode/BC_UtilCodingConvert.h" 7 #include "xfa/fxbarcode/BC_UtilCodingConvert.h"
8 8
9 CBC_UtilCodingConvert::CBC_UtilCodingConvert() {} 9 CBC_UtilCodingConvert::CBC_UtilCodingConvert() {}
10 10
(...skipping 18 matching lines...) Expand all
29 dst.Add(utf8[i]); 29 dst.Add(utf8[i]);
30 } 30 }
31 } 31 }
32 32
33 void CBC_UtilCodingConvert::Utf8ToLocale(const CFX_ByteArray& src, 33 void CBC_UtilCodingConvert::Utf8ToLocale(const CFX_ByteArray& src,
34 CFX_ByteString& dst) { 34 CFX_ByteString& dst) {
35 CFX_ByteString utf8; 35 CFX_ByteString utf8;
36 for (int32_t i = 0; i < src.GetSize(); i++) { 36 for (int32_t i = 0; i < src.GetSize(); i++) {
37 utf8 += src[i]; 37 utf8 += src[i];
38 } 38 }
39 CFX_WideString unicode = CFX_WideString::FromUTF8(utf8, utf8.GetLength()); 39 CFX_WideString unicode = CFX_WideString::FromUTF8(utf8.AsByteStringC());
40 dst = CFX_ByteString::FromUnicode(unicode); 40 dst = CFX_ByteString::FromUnicode(unicode);
41 } 41 }
42 42
43 void CBC_UtilCodingConvert::Utf8ToLocale(const uint8_t* src, 43 void CBC_UtilCodingConvert::Utf8ToLocale(const uint8_t* src,
44 int32_t count, 44 int32_t count,
45 CFX_ByteString& dst) { 45 CFX_ByteString& dst) {
46 CFX_WideString unicode = CFX_WideString::FromUTF8((const char*)src, count); 46 CFX_WideString unicode =
47 CFX_WideString::FromUTF8(CFX_ByteStringC(src, count));
47 dst = CFX_ByteString::FromUnicode(unicode); 48 dst = CFX_ByteString::FromUnicode(unicode);
48 } 49 }
49 50
50 void CBC_UtilCodingConvert::UnicodeToUTF8(const CFX_WideString& src, 51 void CBC_UtilCodingConvert::UnicodeToUTF8(const CFX_WideString& src,
51 CFX_ByteString& dst) { 52 CFX_ByteString& dst) {
52 dst = src.UTF8Encode(); 53 dst = src.UTF8Encode();
53 } 54 }
OLDNEW
« no previous file with comments | « testing/libfuzzer/pdf_xml_fuzzer.cc ('k') | xfa/fxbarcode/cbc_codabar.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698