mv_barcode: Fix enum name conflict

BarcodeType has same name BARCODE_UPCA member which is defined in zint.h
This conflict compile error when include zint.h.
This originally for mapping zint ABI, so changed to it.

Change-Id: If7e808a0b769eb1853494066807d79f78aa8e592
Link: https://github.com/zint/zint/blob/master/backend/zint.h
Signed-off-by: Kwanghoon Son <k.son@samsung.com>

diff --git a/mv_barcode/barcode_generator/include/BarcodeOptions.h b/mv_barcode/barcode_generator/include/BarcodeOptions.h
index 659051b..66ee19d 100644 (file)
--- a/mv_barcode/barcode_generator/include/BarcodeOptions.h
+++ b/mv_barcode/barcode_generator/include/BarcodeOptions.h
@@ -17,6 +17,8 @@
 #ifndef __MEDIA_VISION_BARCODE_OPTIONS_H__
 #define __MEDIA_VISION_BARCODE_OPTIONS_H__
 
+#include <zint.h>
+
 /**
  * @file BarcodeOptions.h
  * @brief This file contains the Barcode options.
@@ -32,20 +34,20 @@ namespace Barcode
  * @since_tizen 2.4
  */
 enum BarcodeType {
-       BARCODE_QR = 58,
-       BARCODE_UPCA = 34,
-       BARCODE_UPCE = 37,
-       BARCODE_EAN8 = 13,
-       BARCODE_EAN13 = BARCODE_EAN8,
-       BARCODE_CODE39 = 8,
-       BARCODE_CODE128 = 20,
-       BARCODE_INTERLEAVE_2_5 = 3,
-       BARCODE_EAN2 = BARCODE_EAN8,
-       BARCODE_EAN5 = BARCODE_EAN8,
-       BARCODE_CODE93 = 25,
-       BARCODE_CODABAR = 18,
-       BARCODE_DATABAR = 29,
-       BARCODE_DATABAR_EXPAND = 31
+       ZINT_BARCODE_QR = BARCODE_QRCODE,
+       ZINT_BARCODE_UPCA = BARCODE_UPCA,
+       ZINT_BARCODE_UPCE = BARCODE_UPCE,
+       ZINT_BARCODE_EAN8 = BARCODE_EANX,
+       ZINT_BARCODE_EAN13 = ZINT_BARCODE_EAN8,
+       ZINT_BARCODE_CODE39 = BARCODE_CODE39,
+       ZINT_BARCODE_CODE128 = BARCODE_CODE128,
+       ZINT_BARCODE_INTERLEAVE_2_5 = BARCODE_C25INTER,
+       ZINT_BARCODE_EAN2 = ZINT_BARCODE_EAN8,
+       ZINT_BARCODE_EAN5 = ZINT_BARCODE_EAN8,
+       ZINT_BARCODE_CODE93 = BARCODE_CODE93,
+       ZINT_BARCODE_CODABAR = BARCODE_CODABAR,
+       ZINT_BARCODE_DATABAR = BARCODE_RSS14,
+       ZINT_BARCODE_DATABAR_EXPAND = BARCODE_RSS_EXP,
 };
 
 /**

diff --git a/mv_barcode/barcode_generator/src/BarcodeGenerator.cpp b/mv_barcode/barcode_generator/src/BarcodeGenerator.cpp
index bd1657e..481adba 100644 (file)
--- a/mv_barcode/barcode_generator/src/BarcodeGenerator.cpp
+++ b/mv_barcode/barcode_generator/src/BarcodeGenerator.cpp
@@ -139,7 +139,7 @@ int createBarcode(const std::string &message, BarcodeType type, BarcodeQREncodin
                }
        }
 
-       if (type == BARCODE_QR) {
+       if (type == ZINT_BARCODE_QR) {
                symbol->whitespace_width = 0;
        } else {
                symbol->whitespace_width = 10;

diff --git a/mv_barcode/barcode_generator/src/mv_barcode_generate_open.cpp b/mv_barcode/barcode_generator/src/mv_barcode_generate_open.cpp
index 16dee22..ab29f15 100644 (file)
--- a/mv_barcode/barcode_generator/src/mv_barcode_generate_open.cpp
+++ b/mv_barcode/barcode_generator/src/mv_barcode_generate_open.cpp
@@ -48,46 +48,46 @@ int alphanumToUpper(std::string &strToTransform)
 
 BarcodeType convertBarcodeType(mv_barcode_type_e type)
 {
-       BarcodeType barcodeType = BARCODE_QR;
+       BarcodeType barcodeType = ZINT_BARCODE_QR;
        switch (type) {
        case MV_BARCODE_UPC_A:
-               barcodeType = BARCODE_UPCA;
+               barcodeType = ZINT_BARCODE_UPCA;
                break;
        case MV_BARCODE_UPC_E:
-               barcodeType = BARCODE_UPCE;
+               barcodeType = ZINT_BARCODE_UPCE;
                break;
        case MV_BARCODE_EAN_8:
-               barcodeType = BARCODE_EAN8;
+               barcodeType = ZINT_BARCODE_EAN8;
                break;
        case MV_BARCODE_EAN_13:
-               barcodeType = BARCODE_EAN13;
+               barcodeType = ZINT_BARCODE_EAN13;
                break;
        case MV_BARCODE_CODE128:
-               barcodeType = BARCODE_CODE128;
+               barcodeType = ZINT_BARCODE_CODE128;
                break;
        case MV_BARCODE_CODE39:
-               barcodeType = BARCODE_CODE39;
+               barcodeType = ZINT_BARCODE_CODE39;
                break;
        case MV_BARCODE_I2_5:
-               barcodeType = BARCODE_INTERLEAVE_2_5;
+               barcodeType = ZINT_BARCODE_INTERLEAVE_2_5;
                break;
        case MV_BARCODE_EAN_2:
-               barcodeType = BARCODE_EAN2;
+               barcodeType = ZINT_BARCODE_EAN2;
                break;
        case MV_BARCODE_EAN_5:
-               barcodeType = BARCODE_EAN5;
+               barcodeType = ZINT_BARCODE_EAN5;
                break;
        case MV_BARCODE_CODE93:
-               barcodeType = BARCODE_CODE93;
+               barcodeType = ZINT_BARCODE_CODE93;
                break;
        case MV_BARCODE_DATABAR:
-               barcodeType = BARCODE_DATABAR;
+               barcodeType = ZINT_BARCODE_DATABAR;
                break;
        case MV_BARCODE_DATABAR_EXPAND:
-               barcodeType = BARCODE_DATABAR_EXPAND;
+               barcodeType = ZINT_BARCODE_DATABAR_EXPAND;
                break;
        case MV_BARCODE_CODABAR:
-               barcodeType = BARCODE_CODABAR;
+               barcodeType = ZINT_BARCODE_CODABAR;
                break;
        default:
                break;