[mod_cv] Replace deprecated definitions and update configure.ac to check renamed...

diff --git a/configure.ac b/configure.ac
index ab3192e5971596d9466a159267908c83d52f82e8..150773412d4b37eaed8a0c6ef51b35b722af2aa0 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1408,7 +1408,9 @@ PKG_CHECK_MODULES([VLC], [libvlc >= 2.1.0],[
 
 PKG_CHECK_MODULES([OPENCV], [opencv >= 2.4.5],[
   AM_CONDITIONAL([HAVE_OPENCV],[true])],[
-  AC_MSG_RESULT([no]); AM_CONDITIONAL([HAVE_OPENCV],[false])])
+  PKG_CHECK_MODULES([OPENCV], [opencv4 >= 2.4.5],[
+    AM_CONDITIONAL([HAVE_OPENCV],[true])],[
+    AC_MSG_RESULT([no]); AM_CONDITIONAL([HAVE_OPENCV],[false])])])
 
 PKG_CHECK_MODULES([OPUSFILE_DECODE], [opusfile >= 0.5],[
    AM_CONDITIONAL([HAVE_OPUSFILE_DECODE],[true])],[

diff --git a/src/mod/applications/mod_cv/mod_cv.cpp b/src/mod/applications/mod_cv/mod_cv.cpp
index 582f925abf6155bdcde284b063dd3a1557c57778..800452dd9abd54da6ae5790071be978e46a4adf3 100644 (file)
--- a/src/mod/applications/mod_cv/mod_cv.cpp
+++ b/src/mod/applications/mod_cv/mod_cv.cpp
@@ -37,7 +37,7 @@
 
 #include <switch.h>
 
-#include "highgui.h"
+#include "opencv2/highgui/highgui_c.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <ctype.h>
@@ -596,9 +596,9 @@ void detectAndDraw(cv_context_t *context)
 
     context->cascade->detectMultiScale( smallImg, detectedObjs,
                                         context->search_scale, context->neighbors, 0
-                                        |CV_HAAR_FIND_BIGGEST_OBJECT
-                                        |CV_HAAR_DO_ROUGH_SEARCH
-                                        |CV_HAAR_SCALE_IMAGE
+                                        |CASCADE_FIND_BIGGEST_OBJECT
+                                        |CASCADE_DO_ROUGH_SEARCH
+                                        |CASCADE_SCALE_IMAGE
                                         ,
                                         Size(context->max_search_w, context->max_search_h) );
 
@@ -679,7 +679,7 @@ void detectAndDraw(cv_context_t *context)
                                                   //|CV_HAAR_FIND_BIGGEST_OBJECT
                                                   //|CV_HAAR_DO_ROUGH_SEARCH
                                                   //|CV_HAAR_DO_CANNY_PRUNING
-                                                  |CV_HAAR_SCALE_IMAGE
+                                                  |CASCADE_SCALE_IMAGE
                                                   ,
                                                   Size(30, 30) );
 
@@ -690,7 +690,7 @@ void detectAndDraw(cv_context_t *context)
                //printf("WTF %d\n", object_neighbors);
         //cout << "Detected " << object_neighbors << " object neighbors" << endl;
         const int rect_height = cvRound((float)img.rows * object_neighbors / max_neighbors);
-        CvScalar col = CV_RGB((float)255 * object_neighbors / max_neighbors, 0, 0);
+        cv:Scalar col = CV_RGB((float)255 * object_neighbors / max_neighbors, 0, 0);
         rectangle(img, cvPoint(0, img.rows), cvPoint(img.cols/10, img.rows - rect_height), col, -1);
 
         parse_stats(&context->nestDetected, nestedObjects.size(), context->skip);