| Index: xfa/fxbarcode/cbc_ean8.cpp
|
| diff --git a/xfa/fxbarcode/cbc_ean8.cpp b/xfa/fxbarcode/cbc_ean8.cpp
|
| index 3316963ea089b4a802e0d8d14078abcee539550f..1128b8469ce506795b1936845d4c7d6bb129e407 100644
|
| --- a/xfa/fxbarcode/cbc_ean8.cpp
|
| +++ b/xfa/fxbarcode/cbc_ean8.cpp
|
| @@ -73,8 +73,7 @@ FX_BOOL CBC_EAN8::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;
|
| @@ -84,14 +83,14 @@ FX_BOOL CBC_EAN8::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_EAN8::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;
|
| }
|
| @@ -110,5 +109,5 @@ CFX_WideString CBC_EAN8::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());
|
| }
|
|
|