From: Tae-Young Chung <ty83.chung@samsung.com>
Date: Tue, 25 Feb 2020 04:50:29 +0000 (+0900)
Subject: Migration to OpenCV 4.2.0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=866b828f70aa98194ceb12105710bd6cda579b32;p=platform%2Fcore%2Fmultimedia%2Flibmm-utility.git

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 9bc5937..6c22c9b 100644
--- 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 1682cd4..0c7082b 100755
--- 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 547d3c5..be98995 100755
--- 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)