digikam

desktop/kde/graphics/digikam/files/digikam-opencv-4.2.patch

@@ -0,0 +1,36 @@
+diff --git a/core/libs/facesengine/detection/opencvfacedetector.cpp b/core/libs/facesengine/detection/opencvfacedetector.cpp
+index 46a56bb2f3..178d31f093 100644
+--- a/core/libs/facesengine/detection/opencvfacedetector.cpp
++++ b/core/libs/facesengine/detection/opencvfacedetector.cpp
+@@ -166,7 +166,7 @@ public:
+      * of the region of interest of this cascade (still relative to whole image).
+      * For frontal face cascades, returns the given parameter unchanged.
+      */
+-    cv::Rect faceROI(const CvRect& faceRect) const
++    cv::Rect faceROI(const cv::Rect faceRect) const
+     {
+         return cv::Rect(lround(faceRect.x + roi.x()      * faceRect.width),
+                         lround(faceRect.y + roi.y()      * faceRect.height),
+diff --git a/core/libs/facesengine/recognition/dlib-dnn/dnnface/dnn_base/cv_image.h b/core/libs/facesengine/recognition/dlib-dnn/dnnface/dnn_base/cv_image.h
+index 370aca14d6..1baf33c2bf 100644
+--- a/core/libs/facesengine/recognition/dlib-dnn/dnnface/dnn_base/cv_image.h
++++ b/core/libs/facesengine/recognition/dlib-dnn/dnnface/dnn_base/cv_image.h
+@@ -52,7 +52,7 @@ public:
+                      << "\n\t img.channels(): " << img.channels()
+                      << "\n\t img.pixel_traits<pixel_type>::num: " << pixel_traits<pixel_type>::num
+                      );
+-        IplImage temp = img;
++        IplImage temp = cvIplImage(img);
+         init(&temp);
+     }
+ 
+@@ -125,7 +125,7 @@ public:
+ 
+     cv_image& operator=( const cv::Mat img)
+     {
+-        IplImage temp = img;
++        IplImage temp = cvIplImage(img);
+         init(&temp);
+         return *this;
+     }
+ 

desktop/kde/graphics/digikam/pspec.xml

@@ -95,7 +95,10 @@
             <Dependency>boost-devel</Dependency>
             <Dependency>kemoticons-devel</Dependency>
             <Dependency>kcontacts-devel</Dependency>
-        </BuildDependencies>        
+        </BuildDependencies>
+        <Patches>
+            <Patch level="1">digikam-opencv-4.2.patch</Patch>
+        </Patches>
     </Source>
 
     <Package>