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

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

Issue 1857073002: Make down-conversion explicit from CFX_Widetring to CFX_WideStringC. (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master
Patch Set: String argument type 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 | « xfa/fxbarcode/cbc_ean13.cpp ('k') | xfa/fxbarcode/cbc_upca.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 2016 PDFium Authors. All rights reserved. 1 // Copyright 2016 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 * Copyright 2011 ZXing authors 7 * Copyright 2011 ZXing authors
8 * 8 *
9 * Licensed under the Apache License, Version 2.0 (the "License"); 9 * Licensed under the Apache License, Version 2.0 (the "License");
10 * you may not use this file except in compliance with the License. 10 * you may not use this file except in compliance with the License.
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
66 BCFORMAT format = BCFORMAT_EAN_8; 66 BCFORMAT format = BCFORMAT_EAN_8;
67 int32_t outWidth = 0; 67 int32_t outWidth = 0;
68 int32_t outHeight = 0; 68 int32_t outHeight = 0;
69 CFX_WideString encodeContents = Preprocess(contents); 69 CFX_WideString encodeContents = Preprocess(contents);
70 CFX_ByteString byteString = encodeContents.UTF8Encode(); 70 CFX_ByteString byteString = encodeContents.UTF8Encode();
71 m_renderContents = encodeContents; 71 m_renderContents = encodeContents;
72 uint8_t* data = static_cast<CBC_OnedEAN8Writer*>(m_pBCWriter) 72 uint8_t* data = static_cast<CBC_OnedEAN8Writer*>(m_pBCWriter)
73 ->Encode(byteString, format, outWidth, outHeight, e); 73 ->Encode(byteString, format, outWidth, outHeight, e);
74 BC_EXCEPTION_CHECK_ReturnValue(e, FALSE); 74 BC_EXCEPTION_CHECK_ReturnValue(e, FALSE);
75 ((CBC_OneDimWriter*)m_pBCWriter) 75 ((CBC_OneDimWriter*)m_pBCWriter)
76 ->RenderResult(encodeContents, data, outWidth, isDevice, e); 76 ->RenderResult(encodeContents.AsWideStringC(), data, outWidth, isDevice,
77 e);
77 FX_Free(data); 78 FX_Free(data);
78 BC_EXCEPTION_CHECK_ReturnValue(e, FALSE); 79 BC_EXCEPTION_CHECK_ReturnValue(e, FALSE);
79 return TRUE; 80 return TRUE;
80 } 81 }
81 82
82 FX_BOOL CBC_EAN8::RenderDevice(CFX_RenderDevice* device, 83 FX_BOOL CBC_EAN8::RenderDevice(CFX_RenderDevice* device,
83 const CFX_Matrix* matirx, 84 const CFX_Matrix* matirx,
84 int32_t& e) { 85 int32_t& e) {
85 ((CBC_OneDimWriter*)m_pBCWriter) 86 ((CBC_OneDimWriter*)m_pBCWriter)
86 ->RenderDeviceResult(device, matirx, m_renderContents, e); 87 ->RenderDeviceResult(device, matirx, m_renderContents.AsWideStringC(), e);
87 BC_EXCEPTION_CHECK_ReturnValue(e, FALSE); 88 BC_EXCEPTION_CHECK_ReturnValue(e, FALSE);
88 return TRUE; 89 return TRUE;
89 } 90 }
90 91
91 FX_BOOL CBC_EAN8::RenderBitmap(CFX_DIBitmap*& pOutBitmap, int32_t& e) { 92 FX_BOOL CBC_EAN8::RenderBitmap(CFX_DIBitmap*& pOutBitmap, int32_t& e) {
92 ((CBC_OneDimWriter*)m_pBCWriter) 93 ((CBC_OneDimWriter*)m_pBCWriter)
93 ->RenderBitmapResult(pOutBitmap, m_renderContents, e); 94 ->RenderBitmapResult(pOutBitmap, m_renderContents.AsWideStringC(), e);
94 BC_EXCEPTION_CHECK_ReturnValue(e, FALSE); 95 BC_EXCEPTION_CHECK_ReturnValue(e, FALSE);
95 return TRUE; 96 return TRUE;
96 } 97 }
97 98
98 CFX_WideString CBC_EAN8::Decode(uint8_t* buf, 99 CFX_WideString CBC_EAN8::Decode(uint8_t* buf,
99 int32_t width, 100 int32_t width,
100 int32_t hight, 101 int32_t hight,
101 int32_t& e) { 102 int32_t& e) {
102 CFX_WideString str; 103 CFX_WideString str;
103 return str; 104 return str;
104 } 105 }
105 106
106 CFX_WideString CBC_EAN8::Decode(CFX_DIBitmap* pBitmap, int32_t& e) { 107 CFX_WideString CBC_EAN8::Decode(CFX_DIBitmap* pBitmap, int32_t& e) {
107 CBC_BufferedImageLuminanceSource source(pBitmap); 108 CBC_BufferedImageLuminanceSource source(pBitmap);
108 CBC_GlobalHistogramBinarizer binarizer(&source); 109 CBC_GlobalHistogramBinarizer binarizer(&source);
109 CBC_BinaryBitmap bitmap(&binarizer); 110 CBC_BinaryBitmap bitmap(&binarizer);
110 CFX_ByteString str = m_pBCReader->Decode(&bitmap, 0, e); 111 CFX_ByteString str = m_pBCReader->Decode(&bitmap, 0, e);
111 BC_EXCEPTION_CHECK_ReturnValue(e, FX_WSTRC(L"")); 112 BC_EXCEPTION_CHECK_ReturnValue(e, FX_WSTRC(L""));
112 return CFX_WideString::FromUTF8(str, str.GetLength()); 113 return CFX_WideString::FromUTF8(str, str.GetLength());
113 } 114 }
OLDNEW
« no previous file with comments | « xfa/fxbarcode/cbc_ean13.cpp ('k') | xfa/fxbarcode/cbc_upca.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698