| Index: xfa/fxbarcode/cbc_code128.cpp
|
| diff --git a/xfa/fxbarcode/cbc_code128.cpp b/xfa/fxbarcode/cbc_code128.cpp
|
| index e585de302cb00287f76030309f8e834e639aac82..2f7be931408fa4cb578ba0e0962fa516475506df 100644
|
| --- a/xfa/fxbarcode/cbc_code128.cpp
|
| +++ b/xfa/fxbarcode/cbc_code128.cpp
|
| @@ -58,15 +58,16 @@ FX_BOOL CBC_Code128::Encode(const CFX_WideStringC& contents,
|
| ((CBC_OnedCode128Writer*)m_pBCWriter)->GetType() == BC_CODE128_C) {
|
| content += '0';
|
| }
|
| - CFX_WideString encodeContents =
|
| - ((CBC_OnedCode128Writer*)m_pBCWriter)->FilterContents(content);
|
| + CFX_WideString encodeContents = ((CBC_OnedCode128Writer*)m_pBCWriter)
|
| + ->FilterContents(content.AsWideStringC());
|
| 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, data, outWidth, isDevice, e);
|
| + ->RenderResult(encodeContents.AsWideStringC(), data, outWidth, isDevice,
|
| + e);
|
| FX_Free(data);
|
| BC_EXCEPTION_CHECK_ReturnValue(e, FALSE);
|
| return TRUE;
|
| @@ -76,14 +77,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, e);
|
| + ->RenderDeviceResult(device, matirx, m_renderContents.AsWideStringC(), 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, e);
|
| + ->RenderBitmapResult(pOutBitmap, m_renderContents.AsWideStringC(), e);
|
| BC_EXCEPTION_CHECK_ReturnValue(e, FALSE);
|
| return TRUE;
|
| }
|
|
|