From a98600aeb8d815c297834aa5006f5c3ea20dde6d Mon Sep 17 00:00:00 2001 From: Dan Sinclair Date: Mon, 21 Mar 2016 15:15:56 -0400 Subject: Move xfa/include/fxbarcode/BC_Barcode.h to xfa/fxbarcode. This CL splits apart the larger header into individual class headers in the xfa/fxbarcode directory. R=tsepez@chromium.org Review URL: https://codereview.chromium.org/1816133002 . --- xfa/fwl/basewidget/fxmath_barcodeimp.cpp | 15 +++++++++++++-- xfa/fwl/basewidget/fxmath_barcodeimp.h | 8 +++++++- 2 files changed, 20 insertions(+), 3 deletions(-) (limited to 'xfa/fwl/basewidget') diff --git a/xfa/fwl/basewidget/fxmath_barcodeimp.cpp b/xfa/fwl/basewidget/fxmath_barcodeimp.cpp index c27805ef83..9792c6f7cc 100644 --- a/xfa/fwl/basewidget/fxmath_barcodeimp.cpp +++ b/xfa/fwl/basewidget/fxmath_barcodeimp.cpp @@ -6,6 +6,17 @@ #include "xfa/fwl/basewidget/fxmath_barcodeimp.h" +#include "xfa/fxbarcode/cbc_codabar.h" +#include "xfa/fxbarcode/cbc_code128.h" +#include "xfa/fxbarcode/cbc_code39.h" +#include "xfa/fxbarcode/cbc_codebase.h" +#include "xfa/fxbarcode/cbc_datamatrix.h" +#include "xfa/fxbarcode/cbc_ean13.h" +#include "xfa/fxbarcode/cbc_ean8.h" +#include "xfa/fxbarcode/cbc_pdf417i.h" +#include "xfa/fxbarcode/cbc_qrcode.h" +#include "xfa/fxbarcode/cbc_upca.h" + static CBC_CodeBase* FX_Barcode_CreateBarCodeEngineObject(BC_TYPE type) { switch (type) { case BC_CODE39: @@ -42,7 +53,7 @@ CFX_Barcode::~CFX_Barcode() { m_pBCEngine = NULL; } } -FX_BOOL CFX_Barcode::Crreate(BC_TYPE type) { +FX_BOOL CFX_Barcode::Create(BC_TYPE type) { m_pBCEngine = FX_Barcode_CreateBarCodeEngineObject(type); return m_pBCEngine != NULL; } @@ -377,7 +388,7 @@ CFX_WideString CFX_Barcode::Decode(CFX_DIBitmap* pBitmap, int32_t& errorCode) { } IFX_Barcode* FX_Barcode_Create(BC_TYPE type) { CFX_Barcode* pBarcode = new CFX_Barcode; - if (pBarcode->Crreate(type)) { + if (pBarcode->Create(type)) { return pBarcode; } pBarcode->Release(); diff --git a/xfa/fwl/basewidget/fxmath_barcodeimp.h b/xfa/fwl/basewidget/fxmath_barcodeimp.h index a26761e0d7..077aeea952 100644 --- a/xfa/fwl/basewidget/fxmath_barcodeimp.h +++ b/xfa/fwl/basewidget/fxmath_barcodeimp.h @@ -7,13 +7,19 @@ #ifndef XFA_FWL_BASEWIDGET_FXMATH_BARCODEIMP_H_ #define XFA_FWL_BASEWIDGET_FXMATH_BARCODEIMP_H_ +#include "core/include/fxcrt/fx_string.h" +#include "core/include/fxcrt/fx_system.h" +#include "xfa/fxbarcode/include/BC_Library.h" #include "xfa/include/fwl/basewidget/fxmath_barcode.h" +class CBC_CodeBase; + class CFX_Barcode : public IFX_Barcode { public: CFX_Barcode(); ~CFX_Barcode(); - FX_BOOL Crreate(BC_TYPE type); + + FX_BOOL Create(BC_TYPE type); virtual void Release(); virtual BC_TYPE GetType(); virtual FX_BOOL Encode(const CFX_WideStringC& contents, -- cgit v1.2.3