diff options
author | Tae-Young Chung <ty83.chung@samsung.com> | 2020-04-07 12:18:27 +0900 |
---|---|---|
committer | Tae-Young Chung <ty83.chung@samsung.com> | 2020-04-07 12:18:27 +0900 |
commit | 7ba07e8e874076dbac4f3b0470cc61a12d5a2f04 (patch) | |
tree | be2af572fccdf9c7a3c7dea20ccf0b1accb7c075 | |
parent | 15c3265a4c6e63eed8477561d345452dd8a118d4 (diff) | |
parent | 3d66ae8e3e5328edbc8d50ffce9497ebf12e86b4 (diff) | |
download | mediavision-submit/tizen/20200414.011245.tar.gz mediavision-submit/tizen/20200414.011245.tar.bz2 mediavision-submit/tizen/20200414.011245.zip |
Migration OpenCV-4.2.0submit/tizen/20200414.011245submit/tizen/20200410.044903submit/tizen/20200407.083853accepted/tizen/unified/20200417.152820
Change-Id: Ib027c2d6864adf8d13350a372409dce4ea5214bf
Signed-off-by: Tae-Young Chung <ty83.chung@samsung.com>
14 files changed, 14 insertions, 10 deletions
diff --git a/mv_barcode/barcode_generator/src/BarcodeGenerator.cpp b/mv_barcode/barcode_generator/src/BarcodeGenerator.cpp index 40579468..11a01cd2 100644 --- a/mv_barcode/barcode_generator/src/BarcodeGenerator.cpp +++ b/mv_barcode/barcode_generator/src/BarcodeGenerator.cpp @@ -23,6 +23,7 @@ #include <opencv2/core.hpp> #include <opencv2/imgproc.hpp> #include <opencv2/highgui.hpp> +#include <opencv2/imgcodecs/legacy/constants_c.h> #include <cstring> #include <vector> diff --git a/mv_face/face/src/FaceEyeCondition.cpp b/mv_face/face/src/FaceEyeCondition.cpp index 7a5b9bb8..7e953c67 100644 --- a/mv_face/face/src/FaceEyeCondition.cpp +++ b/mv_face/face/src/FaceEyeCondition.cpp @@ -19,6 +19,7 @@ #include <mv_private.h> #include <vector> +#include <opencv2/imgproc/imgproc_c.h> namespace MediaVision { namespace Face { diff --git a/mv_face/face/src/FaceUtil.cpp b/mv_face/face/src/FaceUtil.cpp index c2e5ec01..31a2a9ee 100644 --- a/mv_face/face/src/FaceUtil.cpp +++ b/mv_face/face/src/FaceUtil.cpp @@ -19,6 +19,7 @@ #include "mv_private.h" #include <opencv2/imgproc.hpp> +#include <opencv2/imgproc/imgproc_c.h> namespace MediaVision { namespace Face { diff --git a/mv_image/image/include/Recognition/ImageObject.h b/mv_image/image/include/Recognition/ImageObject.h index 2b9253e9..35d33e2a 100644 --- a/mv_image/image/include/Recognition/ImageObject.h +++ b/mv_image/image/include/Recognition/ImageObject.h @@ -21,8 +21,6 @@ #include "Features/FeaturePack.h" -#include <opencv/cv.h> - /** * @file ImageObject.h * @brief This file contains the @ref ImageObject class. diff --git a/mv_image/image/include/Tracking/ImageContourStabilizator.h b/mv_image/image/include/Tracking/ImageContourStabilizator.h index 4163218f..4b0b224a 100644 --- a/mv_image/image/include/Tracking/ImageContourStabilizator.h +++ b/mv_image/image/include/Tracking/ImageContourStabilizator.h @@ -17,10 +17,9 @@ #ifndef __MEDIA_VISION_IMAGECONTOURSTABILIZATOR_H__ #define __MEDIA_VISION_IMAGECONTOURSTABILIZATOR_H__ +#include <deque> #include "ImageConfig.h" -#include <opencv/cv.h> - /** * @file ImageContourStabilizator.h * @brief This file contains functionality for image contour stabilization diff --git a/mv_image/image/src/Features/FeatureMatcher.cpp b/mv_image/image/src/Features/FeatureMatcher.cpp index 24d9d9e9..46ba27de 100644 --- a/mv_image/image/src/Features/FeatureMatcher.cpp +++ b/mv_image/image/src/Features/FeatureMatcher.cpp @@ -19,6 +19,7 @@ #include "ImageMathUtil.h" #include <opencv2/core.hpp> +#include <opencv2/calib3d/calib3d_c.h> namespace MediaVision { namespace Image { diff --git a/mv_image/image/src/Recognition/ImageObject.cpp b/mv_image/image/src/Recognition/ImageObject.cpp index 60d30b2f..79f99c9a 100644 --- a/mv_image/image/src/Recognition/ImageObject.cpp +++ b/mv_image/image/src/Recognition/ImageObject.cpp @@ -25,7 +25,6 @@ #include "mv_private.h" #include "mv_common.h" -#include <opencv/cv.h> #include <opencv2/features2d.hpp> #include <fstream> diff --git a/mv_image/image/src/Recognition/ImageRecognizer.cpp b/mv_image/image/src/Recognition/ImageRecognizer.cpp index b7040db8..a119009e 100644 --- a/mv_image/image/src/Recognition/ImageRecognizer.cpp +++ b/mv_image/image/src/Recognition/ImageRecognizer.cpp @@ -16,6 +16,7 @@ #include "Recognition/ImageRecognizer.h" #include "Recognition/ImageObject.h" +#include <opencv2/calib3d/calib3d_c.h> #include "mv_private.h" diff --git a/mv_image/image/src/mv_image_open.cpp b/mv_image/image/src/mv_image_open.cpp index d0ca6980..1d690078 100644 --- a/mv_image/image/src/mv_image_open.cpp +++ b/mv_image/image/src/mv_image_open.cpp @@ -27,6 +27,7 @@ #include "Tracking/ImageTrackingModel.h" #include <opencv2/core.hpp> +#include <opencv2/imgproc/imgproc_c.h> namespace { diff --git a/mv_surveillance/surveillance/include/EventTriggerMovementDetection.h b/mv_surveillance/surveillance/include/EventTriggerMovementDetection.h index 95b4bb93..e775446c 100644 --- a/mv_surveillance/surveillance/include/EventTriggerMovementDetection.h +++ b/mv_surveillance/surveillance/include/EventTriggerMovementDetection.h @@ -27,8 +27,6 @@ #include "EventResult.h" #include "EventDefs.h" -#include <opencv/cv.h> - namespace mediavision { namespace surveillance { diff --git a/mv_surveillance/surveillance/src/EventTriggerMovementDetection.cpp b/mv_surveillance/surveillance/src/EventTriggerMovementDetection.cpp index 6385f3a8..72c387be 100644 --- a/mv_surveillance/surveillance/src/EventTriggerMovementDetection.cpp +++ b/mv_surveillance/surveillance/src/EventTriggerMovementDetection.cpp @@ -23,6 +23,7 @@ #include <mv_private.h> #include "opencv2/highgui.hpp" +#include "opencv2/imgproc/imgproc_c.h" namespace mediavision { namespace surveillance { diff --git a/mv_surveillance/surveillance/src/SurveillanceHelper.cpp b/mv_surveillance/surveillance/src/SurveillanceHelper.cpp index d2dddcc6..e9710715 100644 --- a/mv_surveillance/surveillance/src/SurveillanceHelper.cpp +++ b/mv_surveillance/surveillance/src/SurveillanceHelper.cpp @@ -20,6 +20,7 @@ #include "opencv2/imgproc.hpp" #include "opencv2/highgui.hpp" +#include "opencv2/imgproc/imgproc_c.h" namespace mediavision { namespace surveillance { diff --git a/packaging/capi-media-vision.spec b/packaging/capi-media-vision.spec index 0990895e..76249411 100644 --- a/packaging/capi-media-vision.spec +++ b/packaging/capi-media-vision.spec @@ -1,7 +1,7 @@ Name: capi-media-vision Summary: Media Vision library for Tizen Native API -Version: 0.5.1 -Release: 4 +Version: 0.5.2 +Release: 1 Group: Multimedia/Framework License: Apache-2.0 and BSD-3-Clause Source0: %{name}-%{version}.tar.gz @@ -10,7 +10,7 @@ BuildRequires: pkgconfig(capi-media-tool) BuildRequires: pkgconfig(libtbm) BuildRequires: pkgconfig(dlog) BuildRequires: pkgconfig(capi-system-info) -BuildRequires: pkgconfig(opencv) >= 3.4.1 +BuildRequires: pkgconfig(opencv) BuildRequires: pkgconfig(zbar) BuildRequires: pkgconfig(glib-2.0) # Change to the pkgconfig(zint) after zint package refactor diff --git a/test/testsuites/common/image_helper/src/ImageHelper.cpp b/test/testsuites/common/image_helper/src/ImageHelper.cpp index a02486c8..d4fb4cd4 100644 --- a/test/testsuites/common/image_helper/src/ImageHelper.cpp +++ b/test/testsuites/common/image_helper/src/ImageHelper.cpp @@ -26,6 +26,8 @@ #include <opencv2/core.hpp> #include <opencv2/highgui.hpp> #include <opencv2/imgproc.hpp> +#include <opencv2/imgproc/imgproc_c.h> +#include <opencv2/imgcodecs/legacy/constants_c.h> /** * @file ImageHelper.cpp |