opencv: Fix build for opencv >= 3.4.2

The `CV_RGB` macro is now in `imgproc.hpp`.

Fixes:

    ../subprojects/gst-plugins-bad/ext/opencv/gsthanddetect.cpp:497:40: error: ‘CV_RGB’ was not declared in this scope
            cvCircle (img, center, radius, CV_RGB (0, 0, 200), 1, 8, 0);
                                        ^~~~~~

diff --git a/ext/opencv/MotionCells.cpp b/ext/opencv/MotionCells.cpp
index f85989e1178d910bbfe9e68854e483087dc9c793..175ec901b2ea9ff142b9cc804c58f116be853ccd 100644 (file)
--- a/ext/opencv/MotionCells.cpp
+++ b/ext/opencv/MotionCells.cpp
@@ -51,6 +51,9 @@
 
 #include <errno.h>
 #include "MotionCells.h"
+#if (CV_MAJOR_VERSION >= 3)
+#include <opencv2/imgproc.hpp>
+#endif
 #include <opencv2/imgproc/imgproc_c.h>
 
 MotionCells::MotionCells ()

diff --git a/ext/opencv/gsthanddetect.cpp b/ext/opencv/gsthanddetect.cpp
index 60fd5be72b127d022de7520a423517f010868984..47203fd0ea65c78dfa2f78794b73e7c5c5cbcaa2 100644 (file)
--- a/ext/opencv/gsthanddetect.cpp
+++ b/ext/opencv/gsthanddetect.cpp
@@ -62,6 +62,9 @@
 
 /* element header */
 #include "gsthanddetect.h"
+#if (CV_MAJOR_VERSION >= 3)
+#include <opencv2/imgproc.hpp>
+#endif
 #include <opencv2/imgproc/imgproc_c.h>
 
 GST_DEBUG_CATEGORY_STATIC (gst_handdetect_debug);

diff --git a/ext/opencv/gsttemplatematch.cpp b/ext/opencv/gsttemplatematch.cpp
index f39208dc28316fd24a689afbc5a61e6244d1e7a9..ec0b56af8844b08a2b25896d186219cf709856a1 100644 (file)
--- a/ext/opencv/gsttemplatematch.cpp
+++ b/ext/opencv/gsttemplatematch.cpp
@@ -63,6 +63,9 @@
 
 #include "../../gst-libs/gst/gst-i18n-plugin.h"
 #include "gsttemplatematch.h"
+#if (CV_MAJOR_VERSION >= 3)
+#include <opencv2/imgproc.hpp>
+#endif
 #include <opencv2/imgproc/imgproc_c.h>
 
 GST_DEBUG_CATEGORY_STATIC (gst_template_match_debug);