From 4c3debb3c91f5842784be30a911b52cdabcab7df Mon Sep 17 00:00:00 2001 From: tsepez Date: Fri, 8 Apr 2016 12:20:38 -0700 Subject: Rename both As{Byte,Wide}StringC() helpers to AsStringC(). The naming is redundant given the base type, and will stand in the way of consolidating Byte and Wide code. BUG= Review URL: https://codereview.chromium.org/1862123003 --- xfa/fxbarcode/cbc_codabar.cpp | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'xfa/fxbarcode/cbc_codabar.cpp') diff --git a/xfa/fxbarcode/cbc_codabar.cpp b/xfa/fxbarcode/cbc_codabar.cpp index ae2b1f2ba2..fad026ddb7 100644 --- a/xfa/fxbarcode/cbc_codabar.cpp +++ b/xfa/fxbarcode/cbc_codabar.cpp @@ -77,8 +77,7 @@ FX_BOOL CBC_Codabar::Encode(const CFX_WideStringC& contents, ->Encode(byteString, format, outWidth, outHeight, e); BC_EXCEPTION_CHECK_ReturnValue(e, FALSE); ((CBC_OneDimWriter*)m_pBCWriter) - ->RenderResult(filtercontents.AsWideStringC(), data, outWidth, isDevice, - e); + ->RenderResult(filtercontents.AsStringC(), data, outWidth, isDevice, e); FX_Free(data); BC_EXCEPTION_CHECK_ReturnValue(e, FALSE); return TRUE; @@ -89,9 +88,9 @@ FX_BOOL CBC_Codabar::RenderDevice(CFX_RenderDevice* device, int32_t& e) { CFX_WideString renderCon = ((CBC_OnedCodaBarWriter*)m_pBCWriter) - ->encodedContents(m_renderContents.AsWideStringC()); + ->encodedContents(m_renderContents.AsStringC()); ((CBC_OneDimWriter*)m_pBCWriter) - ->RenderDeviceResult(device, matirx, renderCon.AsWideStringC(), e); + ->RenderDeviceResult(device, matirx, renderCon.AsStringC(), e); BC_EXCEPTION_CHECK_ReturnValue(e, FALSE); return TRUE; } @@ -99,9 +98,9 @@ FX_BOOL CBC_Codabar::RenderDevice(CFX_RenderDevice* device, FX_BOOL CBC_Codabar::RenderBitmap(CFX_DIBitmap*& pOutBitmap, int32_t& e) { CFX_WideString renderCon = ((CBC_OnedCodaBarWriter*)m_pBCWriter) - ->encodedContents(m_renderContents.AsWideStringC()); + ->encodedContents(m_renderContents.AsStringC()); ((CBC_OneDimWriter*)m_pBCWriter) - ->RenderBitmapResult(pOutBitmap, renderCon.AsWideStringC(), e); + ->RenderBitmapResult(pOutBitmap, renderCon.AsStringC(), e); BC_EXCEPTION_CHECK_ReturnValue(e, FALSE); return TRUE; } @@ -120,5 +119,5 @@ CFX_WideString CBC_Codabar::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()); } -- cgit v1.2.3