diff options
| author | Thibault Saunier <tsaunier@igalia.com> | 2018-07-13 14:42:28 -0400 |
|---|---|---|
| committer | Thibault Saunier <tsaunier@igalia.com> | 2018-07-14 08:01:27 -0400 |
| commit | c247745faaf885fd3fa094198fc0ea288e295dbf (patch) | |
| tree | 01827def86f9d30d579cc17e2d6e791f8da7975e /ext/opencv | |
| parent | 6fd3e2a4009835295d938abb533b4ebbbfa7ca1a (diff) | |
| download | gstreamer-plugins-bad-c247745faaf885fd3fa094198fc0ea288e295dbf.tar.gz | |
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);
^~~~~~
Diffstat (limited to 'ext/opencv')
| -rw-r--r-- | ext/opencv/MotionCells.cpp | 3 | ||||
| -rw-r--r-- | ext/opencv/gsthanddetect.cpp | 3 | ||||
| -rw-r--r-- | ext/opencv/gsttemplatematch.cpp | 3 |
3 files changed, 9 insertions, 0 deletions
diff --git a/ext/opencv/MotionCells.cpp b/ext/opencv/MotionCells.cpp index f85989e11..175ec901b 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 () diff --git a/ext/opencv/gsthanddetect.cpp b/ext/opencv/gsthanddetect.cpp index 60fd5be72..47203fd0e 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); diff --git a/ext/opencv/gsttemplatematch.cpp b/ext/opencv/gsttemplatematch.cpp index f39208dc2..ec0b56af8 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); |