commit bcb4362919a8fc9998a4ca7378af17a11c9e8649
author Thibault Saunier <tsaunier@igalia.com> Fri Jul 13 14:42:28 2018 -0400
committer Thibault Saunier <tsaunier@igalia.com> Tue Aug 07 08:59:07 2018 -0400
tree 75b583d1f99de162f8002f5f6485e47941795cf9
parent b7e949f3f5d8c9627dfde37d275739e5e5c8635b

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);
                                        ^~~~~~

ext/opencv/MotionCells.cpp

diff --git a/ext/opencv/MotionCells.cpp b/ext/opencv/MotionCells.cpp
index f85989e..175ec90 100644
--- 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 ()

ext/opencv/gsthanddetect.cpp

diff --git a/ext/opencv/gsthanddetect.cpp b/ext/opencv/gsthanddetect.cpp
index 60fd5be..47203fd 100644
--- 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);

ext/opencv/gsttemplatematch.cpp

diff --git a/ext/opencv/gsttemplatematch.cpp b/ext/opencv/gsttemplatematch.cpp
index f39208d..ec0b56a 100644
--- 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);