| Index: xfa/fxbarcode/cbc_code128.cpp
|
| diff --git a/xfa/fxbarcode/cbc_code128.cpp b/xfa/fxbarcode/cbc_code128.cpp
|
| index 93417b4e16e6930526ae3a4cce68f55665f26718..98490f2e60aac156826db0f43655983b9d56d3d2 100644
|
| --- a/xfa/fxbarcode/cbc_code128.cpp
|
| +++ b/xfa/fxbarcode/cbc_code128.cpp
|
| @@ -59,15 +59,14 @@ FX_BOOL CBC_Code128::Encode(const CFX_WideStringC& contents,
|
| content += '0';
|
| }
|
| CFX_WideString encodeContents = ((CBC_OnedCode128Writer*)m_pBCWriter)
|
| - ->FilterContents(content.AsWideStringC());
|
| + ->FilterContents(content.AsStringC());
|
| m_renderContents = encodeContents;
|
| CFX_ByteString byteString = encodeContents.UTF8Encode();
|
| uint8_t* data = static_cast<CBC_OnedCode128Writer*>(m_pBCWriter)
|
| ->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;
|
| @@ -77,14 +76,14 @@ FX_BOOL CBC_Code128::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_Code128::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;
|
| }
|
| @@ -103,5 +102,5 @@ CFX_WideString CBC_Code128::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());
|
| }
|
|
|