digikam-opencv-4.2.patch 1.6 KB

12345678910111213141516171819202122232425262728293031323334353637
  1. diff --git a/core/libs/facesengine/detection/opencvfacedetector.cpp b/core/libs/facesengine/detection/opencvfacedetector.cpp
  2. index 46a56bb2f3..178d31f093 100644
  3. --- a/core/libs/facesengine/detection/opencvfacedetector.cpp
  4. +++ b/core/libs/facesengine/detection/opencvfacedetector.cpp
  5. @@ -166,7 +166,7 @@ public:
  6. * of the region of interest of this cascade (still relative to whole image).
  7. * For frontal face cascades, returns the given parameter unchanged.
  8. */
  9. - cv::Rect faceROI(const CvRect& faceRect) const
  10. + cv::Rect faceROI(const cv::Rect faceRect) const
  11. {
  12. return cv::Rect(lround(faceRect.x + roi.x() * faceRect.width),
  13. lround(faceRect.y + roi.y() * faceRect.height),
  14. 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
  15. index 370aca14d6..1baf33c2bf 100644
  16. --- a/core/libs/facesengine/recognition/dlib-dnn/dnnface/dnn_base/cv_image.h
  17. +++ b/core/libs/facesengine/recognition/dlib-dnn/dnnface/dnn_base/cv_image.h
  18. @@ -52,7 +52,7 @@ public:
  19. << "\n\t img.channels(): " << img.channels()
  20. << "\n\t img.pixel_traits<pixel_type>::num: " << pixel_traits<pixel_type>::num
  21. );
  22. - IplImage temp = img;
  23. + IplImage temp = cvIplImage(img);
  24. init(&temp);
  25. }
  26. @@ -125,7 +125,7 @@ public:
  27. cv_image& operator=( const cv::Mat img)
  28. {
  29. - IplImage temp = img;
  30. + IplImage temp = cvIplImage(img);
  31. init(&temp);
  32. return *this;
  33. }