From b37c759e528ed28997965e370357524f5701502e Mon Sep 17 00:00:00 2001 From: Vanessa Chipirras Navalon Date: Thu, 28 Jan 2016 17:40:51 +0100 Subject: [PATCH] opencv: Ported to OpenCV version 3.1 OpenCV configure.ac was changed to work with new versions of OpenCV 3.X. A new include is added gstopencvutils.cpp because it contains the previous. This keeps compatibility with 2.4. https://bugzilla.gnome.org/show_bug.cgi?id=760473 --- configure.ac | 8 ++------ ext/opencv/gstopencvutils.cpp | 2 +- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/configure.ac b/configure.ac index 78bb9d0cda..8f1992efd0 100644 --- a/configure.ac +++ b/configure.ac @@ -2655,21 +2655,17 @@ AG_GST_CHECK_FEATURE(OPENCV, [opencv plugins], opencv, [ dnl a new version and the no-backward-compatibility define. (There doesn't dnl seem to be a switch to suppress the warnings the cvcompat.h header dnl causes.) - PKG_CHECK_MODULES(OPENCV, opencv >= 2.3.0 opencv < 2.5.0 , [ + PKG_CHECK_MODULES(OPENCV, opencv >= 2.3.0 opencv <= 3.1.0 , [ AC_PROG_CXX AC_LANG([C++]) OLD_CPPFLAGS=$CPPFLAGS CPPFLAGS=$OPENCV_CFLAGS something_not_found=no - AC_CHECK_HEADERS([opencv2/contrib/contrib.hpp \ - opencv2/core/core_c.h \ - opencv2/core/types_c.h \ + AC_CHECK_HEADERS([opencv2/core/core_c.h \ opencv2/core/version.hpp \ opencv2/highgui/highgui_c.h \ opencv2/imgproc/imgproc.hpp \ opencv2/imgproc/imgproc_c.h \ - opencv2/legacy/compat.hpp \ - opencv2/legacy/legacy.hpp \ opencv2/objdetect/objdetect.hpp \ opencv2/video/background_segm.hpp], [], [something_not_found=yes]) CPPFLAGS=$OLD_CPPFLAGS diff --git a/ext/opencv/gstopencvutils.cpp b/ext/opencv/gstopencvutils.cpp index da6eea9a61..57b660dd36 100644 --- a/ext/opencv/gstopencvutils.cpp +++ b/ext/opencv/gstopencvutils.cpp @@ -24,7 +24,7 @@ #endif #include "gstopencvutils.h" -#include +#include gboolean