Migration to OpenCV 4.2.0

imgcv has dependency to OpenCV which is upgraded to 3.4.1.
This is a patch for Migration to OpenCV 3.4.1.

Signed-off-by: Tae-Young Chung <ty83.chung@samsung.com>

diff --git a/imgcv/CMakeLists.txt b/imgcv/CMakeLists.txt
index 9bc593780ad2be470593da8833150f349b5e7268..6c22c9ba051a91e19bb56f598a884486817dfc1f 100644 (file)
--- a/imgcv/CMakeLists.txt
+++ b/imgcv/CMakeLists.txt
@@ -16,7 +16,7 @@ INCLUDE_DIRECTORIES(${INC_DIR}
        ../jpeg/include
        )
 
-SET(dependents "dlog glib-2.0 opencv")
+SET(dependents "dlog glib-2.0 opencv4")
 
 INCLUDE(FindPkgConfig)
 pkg_check_modules(${fw_name} REQUIRED ${dependents})

diff --git a/imgcv/include/mm_util_imgcv_internal.h b/imgcv/include/mm_util_imgcv_internal.h
index 1682cd421c15c6fa2a16a1f58b12036beb91355a..0c7082b2cff831b8301adf6aebe4b92bc4326251 100755 (executable)
--- a/imgcv/include/mm_util_imgcv_internal.h
+++ b/imgcv/include/mm_util_imgcv_internal.h
@@ -21,8 +21,8 @@
 
 #include <stdio.h>
 #include <string.h>
-#include <opencv2/core.hpp>
-#include <opencv2/imgproc.hpp>
+#include <opencv2/core/core_c.h>
+#include <opencv2/imgproc/imgproc_c.h>
 
 #ifdef __cplusplus
        extern "C" {

diff --git a/packaging/libmm-utility.spec b/packaging/libmm-utility.spec
index 547d3c515f7951a52cc9e4f937ce4287d1037ac5..be989951be42bff3710a8a2dabd2cb8f869b2bdf 100755 (executable)
--- a/packaging/libmm-utility.spec
+++ b/packaging/libmm-utility.spec
@@ -17,7 +17,7 @@ BuildRequires:  pkgconfig(gio-2.0)
 BuildRequires:  pkgconfig(gmodule-2.0)
 BuildRequires:  libjpeg-turbo-devel
 BuildRequires:  pkgconfig(libtzplatform-config)
-BuildRequires:  pkgconfig(opencv) >= 3.4.1
+BuildRequires:  pkgconfig(opencv4)
 BuildRequires:  pkgconfig(libpng)
 BuildRequires:  giflib-devel
 BuildRequires:  pkgconfig(libbmp)