summaryrefslogtreecommitdiff
path: root/xfa/fxbarcode/cbc_datamatrix.cpp
diff options
context:
space:
mode:
authortsepez <tsepez@chromium.org>2016-06-06 12:57:44 -0700
committerCommit bot <commit-bot@chromium.org>2016-06-06 12:57:44 -0700
commit52d78564a61fad5d435f3c95a3a6c0df142e50cf (patch)
tree209840b7f578c0e35722984b789a2e9e84d5d428 /xfa/fxbarcode/cbc_datamatrix.cpp
parentfe433f15d60f92ccde7a928160c2e7cc77dcb8bf (diff)
downloadpdfium-52d78564a61fad5d435f3c95a3a6c0df142e50cf.tar.xz
Clean up C-Style casts in CBC_CodeBase and subclasses
Make the parent class own the reader/writer via unique_ptrs. De-virtualize some methods with no overrides. Review-Url: https://codereview.chromium.org/2037573005
Diffstat (limited to 'xfa/fxbarcode/cbc_datamatrix.cpp')
-rw-r--r--xfa/fxbarcode/cbc_datamatrix.cpp23
1 files changed, 11 insertions, 12 deletions
diff --git a/xfa/fxbarcode/cbc_datamatrix.cpp b/xfa/fxbarcode/cbc_datamatrix.cpp
index 7430187f5b..08b76830fd 100644
--- a/xfa/fxbarcode/cbc_datamatrix.cpp
+++ b/xfa/fxbarcode/cbc_datamatrix.cpp
@@ -27,16 +27,12 @@
#include "xfa/fxbarcode/datamatrix/BC_DataMatrixReader.h"
#include "xfa/fxbarcode/datamatrix/BC_DataMatrixWriter.h"
-CBC_DataMatrix::CBC_DataMatrix() {
- m_pBCReader = (CBC_Reader*)new (CBC_DataMatrixReader);
- ((CBC_DataMatrixReader*)m_pBCReader)->Init();
- m_pBCWriter = (CBC_Writer*)new (CBC_DataMatrixWriter);
+CBC_DataMatrix::CBC_DataMatrix()
+ : CBC_CodeBase(new CBC_DataMatrixReader, new CBC_DataMatrixWriter) {
+ static_cast<CBC_DataMatrixReader*>(m_pBCReader.get())->Init();
}
-CBC_DataMatrix::~CBC_DataMatrix() {
- delete (m_pBCReader);
- delete (m_pBCWriter);
-}
+CBC_DataMatrix::~CBC_DataMatrix() {}
FX_BOOL CBC_DataMatrix::Encode(const CFX_WideStringC& contents,
FX_BOOL isDevice,
@@ -44,10 +40,11 @@ FX_BOOL CBC_DataMatrix::Encode(const CFX_WideStringC& contents,
int32_t outWidth = 0;
int32_t outHeight = 0;
uint8_t* data =
- ((CBC_DataMatrixWriter*)m_pBCWriter)
+ static_cast<CBC_DataMatrixWriter*>(m_pBCWriter.get())
->Encode(CFX_WideString(contents), outWidth, outHeight, e);
BC_EXCEPTION_CHECK_ReturnValue(e, FALSE);
- ((CBC_TwoDimWriter*)m_pBCWriter)->RenderResult(data, outWidth, outHeight, e);
+ static_cast<CBC_TwoDimWriter*>(m_pBCWriter.get())
+ ->RenderResult(data, outWidth, outHeight, e);
FX_Free(data);
BC_EXCEPTION_CHECK_ReturnValue(e, FALSE);
return TRUE;
@@ -56,12 +53,14 @@ FX_BOOL CBC_DataMatrix::Encode(const CFX_WideStringC& contents,
FX_BOOL CBC_DataMatrix::RenderDevice(CFX_RenderDevice* device,
const CFX_Matrix* matrix,
int32_t& e) {
- ((CBC_TwoDimWriter*)m_pBCWriter)->RenderDeviceResult(device, matrix);
+ static_cast<CBC_TwoDimWriter*>(m_pBCWriter.get())
+ ->RenderDeviceResult(device, matrix);
return TRUE;
}
FX_BOOL CBC_DataMatrix::RenderBitmap(CFX_DIBitmap*& pOutBitmap, int32_t& e) {
- ((CBC_TwoDimWriter*)m_pBCWriter)->RenderBitmapResult(pOutBitmap, e);
+ static_cast<CBC_TwoDimWriter*>(m_pBCWriter.get())
+ ->RenderBitmapResult(pOutBitmap, e);
BC_EXCEPTION_CHECK_ReturnValue(e, FALSE);
return TRUE;
}