| Index: xfa/fxbarcode/cbc_ean13.cpp
|
| diff --git a/xfa/fxbarcode/cbc_ean13.cpp b/xfa/fxbarcode/cbc_ean13.cpp
|
| index bb578b286e730ad3eb294cc298e58b7fd3967d3d..c51e262128e338c6cdfda5ed99fa6e55d5abc3aa 100644
|
| --- a/xfa/fxbarcode/cbc_ean13.cpp
|
| +++ b/xfa/fxbarcode/cbc_ean13.cpp
|
| @@ -74,8 +74,7 @@ FX_BOOL CBC_EAN13::Encode(const CFX_WideStringC& contents,
|
| ->Encode(byteString, format, outWidth, outHeight, e);
|
| BC_EXCEPTION_CHECK_ReturnValue(e, FALSE);
|
| ((CBC_OneDimWriter*)m_pBCWriter)
|
| - ->RenderResult(encodeContents.AsWideStringC(), data, outWidth, isDevice,
|
| - e);
|
| + ->RenderResult(encodeContents.AsStringC(), data, outWidth, isDevice, e);
|
| FX_Free(data);
|
| BC_EXCEPTION_CHECK_ReturnValue(e, FALSE);
|
| return TRUE;
|
| @@ -85,14 +84,14 @@ FX_BOOL CBC_EAN13::RenderDevice(CFX_RenderDevice* device,
|
| const CFX_Matrix* matirx,
|
| int32_t& e) {
|
| ((CBC_OneDimWriter*)m_pBCWriter)
|
| - ->RenderDeviceResult(device, matirx, m_renderContents.AsWideStringC(), e);
|
| + ->RenderDeviceResult(device, matirx, m_renderContents.AsStringC(), e);
|
| BC_EXCEPTION_CHECK_ReturnValue(e, FALSE);
|
| return TRUE;
|
| }
|
|
|
| FX_BOOL CBC_EAN13::RenderBitmap(CFX_DIBitmap*& pOutBitmap, int32_t& e) {
|
| ((CBC_OneDimWriter*)m_pBCWriter)
|
| - ->RenderBitmapResult(pOutBitmap, m_renderContents.AsWideStringC(), e);
|
| + ->RenderBitmapResult(pOutBitmap, m_renderContents.AsStringC(), e);
|
| BC_EXCEPTION_CHECK_ReturnValue(e, FALSE);
|
| return TRUE;
|
| }
|
| @@ -111,5 +110,5 @@ CFX_WideString CBC_EAN13::Decode(CFX_DIBitmap* pBitmap, int32_t& e) {
|
| CBC_BinaryBitmap bitmap(&binarizer);
|
| CFX_ByteString str = m_pBCReader->Decode(&bitmap, 0, e);
|
| BC_EXCEPTION_CHECK_ReturnValue(e, FX_WSTRC(L""));
|
| - return CFX_WideString::FromUTF8(str.AsByteStringC());
|
| + return CFX_WideString::FromUTF8(str.AsStringC());
|
| }
|
|
|