[patch] This patch will allow digikam to compile with opencv3

digikam3.patch (text/plain), 2.52 KB, created by Adam Stylinski on 2015-08-20 02:04:04 UTC

--- digikam-4.12.0/core/app/utils/libopencv.h	2015-08-18 15:32:24.635326685 +0200
+++ digikam-4.12.0/core/app/utils/libopencv.h	2015-08-18 16:51:00.716761209 +0200
@@ -46,17 +46,19 @@
 
 #define OPENCV_MAKE_VERSION(major,minor,patch) (((major) << 16) | ((minor) << 8) | (patch))
 #define OPENCV_VERSION                         OPENCV_MAKE_VERSION(CV_MAJOR_VERSION,CV_MINOR_VERSION,CV_SUBMINOR_VERSION)
-#define OPENCV_TEST_VERSION(major,minor,patch) ( OPENCV_VERSION >= OPENCV_MAKE_VERSION(major,minor,patch) )
+#define OPENCV_TEST_VERSION(major,minor,patch) ( OPENCV_VERSION < OPENCV_MAKE_VERSION(major,minor,patch) )
 
-#if OPENCV_TEST_VERSION(2,3,0)
+#if OPENCV_TEST_VERSION(2,5,0)
 #   include <opencv2/opencv.hpp>
 #   include <opencv2/legacy/compat.hpp>
 #   include <opencv/cvaux.h>
+#   include <opencv2/imgproc/imgproc.hpp>
 #else
 #   include <opencv/cv.h>
 #   include <opencv/cvaux.h>
 #   include <opencv/cxcore.h>
 #   include <opencv/highgui.h>
+#   include <opencv2/imgproc.hpp>
 #endif
 
 // Restore warnings
--- digikam-4.12.0/core/libs/database/imgqsort/imgqsort.cpp	2015-08-18 17:17:24.003431310 +0200
+++ digikam-4.12.0/core/libs/database/imgqsort/imgqsort.cpp	2015-08-18 17:25:14.761703338 +0200
@@ -284,8 +284,8 @@ void ImgQSort::readImage() const
     mixer.startFilterDirectly();
 
     d->image.putImageData(mixer.getTargetImage().bits());
-    d->src      = cvCreateMat(d->image.numPixels(), 3, CV_8UC3); // Create a matrix containing the pixel values of original image
-    d->src_gray = cvCreateMat(d->image.numPixels(), 1, CV_8UC1); // Create a matrix containing the pixel values of grayscaled image
+    d->src      = Mat(d->image.numPixels(), 3, CV_8UC3); // Create a matrix containing the pixel values of original image
+    d->src_gray = Mat(d->image.numPixels(), 1, CV_8UC1); // Create a matrix containing the pixel values of grayscaled image
 
     if (d->imq.detectNoise)
     {
@@ -660,7 +660,7 @@ int ImgQSort::compressiondetector() cons
     int countblocks      = 0;
     int number_of_blocks = 0;
     int sum              = 0;
-    vector<int> average_bottom, average_middle, average_top;
+    std::vector<int> average_bottom, average_middle, average_top;
 
     // Go through 8 blocks at a time horizontally
     // iterating through columns.
@@ -797,7 +797,7 @@ int ImgQSort::compressiondetector() cons
 int ImgQSort::exposureamount() const
 {
     /// Separate the image in 3 places ( B, G and R )
-    vector<Mat> bgr_planes;
+    std::vector<Mat> bgr_planes;
     split(d->src, bgr_planes);
 
     /// Establish the number of bins