Convert border style defines to an enum class.

xfa/fwl/basewidget/fxmath_barcodeimp.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #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"
+#include "xfa/fxbarcode/utils.h"
 
 static CBC_CodeBase* FX_Barcode_CreateBarCodeEngineObject(BC_TYPE type) {
   switch (type) {
     case BC_CODE39:
       return new CBC_Code39();
     case BC_CODABAR:
       return new CBC_Codabar();
     case BC_CODE128:
       return new CBC_Code128(BC_CODE128_B);
     case BC_CODE128_B:
@@ skipping 284 matching lines @@
   switch (GetType()) {
     case BC_PDF417:
       memptr = (memptrtype)&CBC_PDF417I::SetTruncated;
       break;
     default:
       break;
   }
   return m_pBCEngine && memptr ? ((m_pBCEngine->*memptr)(truncated), TRUE)
                                : FALSE;
 }
-#ifndef BCExceptionNO
-#define BCExceptionNO 0

[dsinclair, 2016/05/16 18:04:24]

These are all defined in fxbarcode/utils.h

-#endif
-#ifndef BCExceptionFormatException
-#define BCExceptionFormatException 8
-#endif
-#ifndef BCExceptionUnSupportedBarcode
-#define BCExceptionUnSupportedBarcode 18
-#endif
+
 FX_BOOL CFX_Barcode::Encode(const CFX_WideStringC& contents,
                             FX_BOOL isDevice,
                             int32_t& e) {
   if (!m_pBCEngine) {
     return FALSE;
   }
   return m_pBCEngine->Encode(contents, isDevice, e);
 }
 FX_BOOL CFX_Barcode::RenderDevice(CFX_RenderDevice* device,
                                   const CFX_Matrix* matrix,
                                   int32_t& e) {
   if (!m_pBCEngine) {
     return FALSE;
   }
   return m_pBCEngine->RenderDevice(device, matrix, e);
 }
 FX_BOOL CFX_Barcode::RenderBitmap(CFX_DIBitmap*& pOutBitmap, int32_t& e) {
   if (!m_pBCEngine) {
     return FALSE;
   }
   return m_pBCEngine->RenderBitmap(pOutBitmap, e);
 }
-#define BC_TYPE_MIN BC_CODE39
-#define BC_TYPE_MAX BC_DATAMATRIX
+
 CFX_WideString CFX_Barcode::Decode(uint8_t* buf,
                                    int32_t width,
                                    int32_t height,
                                    int32_t& errorCode) {
-  for (BC_TYPE t = BC_TYPE_MIN; t <= BC_TYPE_MAX;
+  for (BC_TYPE t = BC_CODE39; t <= BC_DATAMATRIX;
        t = (BC_TYPE)((int32_t)t + 1)) {
     CBC_CodeBase* pTmpEngine = FX_Barcode_CreateBarCodeEngineObject(t);
     if (!pTmpEngine) {
       continue;
     }
     CFX_WideString ret = pTmpEngine->Decode(buf, width, height, errorCode);
     if (errorCode == BCExceptionNO) {
       return ret;
     }
   }
   errorCode = BCExceptionUnSupportedBarcode;
   return CFX_WideString();
 }
 CFX_WideString CFX_Barcode::Decode(CFX_DIBitmap* pBitmap, int32_t& errorCode) {
-  for (BC_TYPE t = BC_TYPE_MIN; t <= BC_TYPE_MAX;
+  for (BC_TYPE t = BC_CODE39; t <= BC_DATAMATRIX;
        t = (BC_TYPE)((int32_t)t + 1)) {
     CBC_CodeBase* pTmpEngine = FX_Barcode_CreateBarCodeEngineObject(t);
     if (!pTmpEngine) {
       continue;
     }
     CFX_WideString ret = pTmpEngine->Decode(pBitmap, errorCode);
     if (errorCode == BCExceptionNO) {
       return ret;
     }
   }
   errorCode = BCExceptionUnSupportedBarcode;
   return CFX_WideString();
 }