Fix colorspace symbol_to_source

[version] 1.0.15

Change-Id: If77cdd500a6fa730648efb5a04c1af9388c6e303
Signed-off-by: Kwanghoon Son <k.son@samsung.com>

diff --git a/mv_barcode/barcode_generator/src/BarcodeGenerator.cpp b/mv_barcode/barcode_generator/src/BarcodeGenerator.cpp
index 18634a5df11f507ea25dc3d8a16ecfacae3abd25..48d99178e8ae1bbeb71e0a569431bd34e27bd03e 100644 (file)
--- a/mv_barcode/barcode_generator/src/BarcodeGenerator.cpp
+++ b/mv_barcode/barcode_generator/src/BarcodeGenerator.cpp
@@ -659,6 +659,12 @@ int symbol_to_source(zint_symbol *symbol, const BarcodeConfig &config, mv_source
 {
        cv::Mat buf;
        MEDIA_VISION_CHECK_ERR(symbol_to_buf(symbol, config, buf), "symbol_to_buf failed");
+
+       // DesignQR use opencv which returns BGR, but zint return RGB.
+       if (config.type == MV_BARCODE_QR &&
+               (config.data_shape != MV_BARCODE_GENERATE_ATTR_SHAPE_RECT ||
+                config.finder_shape != MV_BARCODE_GENERATE_ATTR_SHAPE_RECT || !config.logo_path.empty()))
+               cv::cvtColor(buf, buf, cv::COLOR_BGR2RGB);
        return mv_source_fill_by_buffer(source, buf.data, buf.total() * buf.elemSize(), buf.cols, buf.rows,
                                                                        MEDIA_VISION_COLORSPACE_RGB888);
 }

diff --git a/packaging/capi-media-vision.spec b/packaging/capi-media-vision.spec
index a0a80a2cdde64e8b7215fb8e480ab5cd6ff38588..94ed9e8669e03a4ec2ef3f239dd3772852870228 100644 (file)
--- a/packaging/capi-media-vision.spec
+++ b/packaging/capi-media-vision.spec
@@ -1,6 +1,6 @@
 Name:        capi-media-vision
 Summary:     Media Vision library for Tizen Native API
-Version:     1.0.14
+Version:     1.0.15
 Release:     0
 Group:       Multimedia/Framework
 License:     Apache-2.0