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

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

Issue 1711893003: Remove CFX_{Byte,Wide}String::ConvertFrom(). (Closed) Base URL: https://pdfium.googlesource.com/pdfium@master
Patch Set: address comments Created 4 years, 10 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 | « xfa/src/fgas/src/localization/fx_locale.cpp ('k') | no next file » | 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 "barcode.h" 7 #include "barcode.h"
8 #include "BC_UtilCodingConvert.h" 8 #include "BC_UtilCodingConvert.h"
9
9 CBC_UtilCodingConvert::CBC_UtilCodingConvert() {} 10 CBC_UtilCodingConvert::CBC_UtilCodingConvert() {}
11
10 CBC_UtilCodingConvert::~CBC_UtilCodingConvert() {} 12 CBC_UtilCodingConvert::~CBC_UtilCodingConvert() {}
13
11 void CBC_UtilCodingConvert::UnicodeToLocale(const CFX_WideString& src, 14 void CBC_UtilCodingConvert::UnicodeToLocale(const CFX_WideString& src,
12 CFX_ByteString& dst) { 15 CFX_ByteString& dst) {
13 dst.ConvertFrom(src); 16 dst = CFX_ByteString::FromUnicode(src);
14 } 17 }
18
15 void CBC_UtilCodingConvert::LocaleToUtf8(const CFX_ByteString& src, 19 void CBC_UtilCodingConvert::LocaleToUtf8(const CFX_ByteString& src,
16 CFX_ByteString& dst) { 20 CFX_ByteString& dst) {
17 CFX_WideString unicode = CFX_WideString::FromLocal(src, src.GetLength()); 21 CFX_WideString unicode = CFX_WideString::FromLocal(src);
18 dst = unicode.UTF8Encode(); 22 dst = unicode.UTF8Encode();
19 } 23 }
24
20 void CBC_UtilCodingConvert::LocaleToUtf8(const CFX_ByteString& src, 25 void CBC_UtilCodingConvert::LocaleToUtf8(const CFX_ByteString& src,
21 CFX_ByteArray& dst) { 26 CFX_ByteArray& dst) {
22 CFX_WideString unicode = CFX_WideString::FromLocal(src, src.GetLength()); 27 CFX_WideString unicode = CFX_WideString::FromLocal(src);
23 CFX_ByteString utf8 = unicode.UTF8Encode(); 28 CFX_ByteString utf8 = unicode.UTF8Encode();
24 for (int32_t i = 0; i < utf8.GetLength(); i++) { 29 for (int32_t i = 0; i < utf8.GetLength(); i++) {
25 dst.Add(utf8[i]); 30 dst.Add(utf8[i]);
26 } 31 }
27 } 32 }
33
28 void CBC_UtilCodingConvert::Utf8ToLocale(const CFX_ByteArray& src, 34 void CBC_UtilCodingConvert::Utf8ToLocale(const CFX_ByteArray& src,
29 CFX_ByteString& dst) { 35 CFX_ByteString& dst) {
30 CFX_ByteString utf8; 36 CFX_ByteString utf8;
31 for (int32_t i = 0; i < src.GetSize(); i++) { 37 for (int32_t i = 0; i < src.GetSize(); i++) {
32 utf8 += src[i]; 38 utf8 += src[i];
33 } 39 }
34 CFX_WideString unicode = CFX_WideString::FromUTF8(utf8, utf8.GetLength()); 40 CFX_WideString unicode = CFX_WideString::FromUTF8(utf8, utf8.GetLength());
35 dst.ConvertFrom(unicode); 41 dst = CFX_ByteString::FromUnicode(unicode);
36 } 42 }
43
37 void CBC_UtilCodingConvert::Utf8ToLocale(const uint8_t* src, 44 void CBC_UtilCodingConvert::Utf8ToLocale(const uint8_t* src,
38 int32_t count, 45 int32_t count,
39 CFX_ByteString& dst) { 46 CFX_ByteString& dst) {
40 CFX_WideString unicode = CFX_WideString::FromUTF8((const char*)src, count); 47 CFX_WideString unicode = CFX_WideString::FromUTF8((const char*)src, count);
41 dst.ConvertFrom(unicode); 48 dst = CFX_ByteString::FromUnicode(unicode);
42 } 49 }
50
43 void CBC_UtilCodingConvert::UnicodeToUTF8(const CFX_WideString& src, 51 void CBC_UtilCodingConvert::UnicodeToUTF8(const CFX_WideString& src,
44 CFX_ByteString& dst) { 52 CFX_ByteString& dst) {
45 dst = src.UTF8Encode(); 53 dst = src.UTF8Encode();
46 } 54 }
OLDNEW
« no previous file with comments | « xfa/src/fgas/src/localization/fx_locale.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698