summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim-Philipp Müller <tim@centricular.net>2012-11-03 13:51:12 +0000
committerTim-Philipp Müller <tim@centricular.net>2012-11-03 13:52:08 +0000
commitfa20fba1a28b9e36a52991d76a474b6e1dc9fb1a (patch)
tree61b1a670541fc51c3658b07e40048a611787df31
parent6fbf96d3e4d578f7ba1b7e1bc2f9c041265f435a (diff)
opencv: fix warnings and build against opencv 2.4.x
gstpyramidsegment.c: In function 'gst_pyramid_segment_chain': gstpyramidsegment.c:307:3: error: implicit declaration of function 'cvPyrSegmentation' [-Werror=implicit-function-declaration] gstpyramidsegment.c:307:3: error: nested extern declaration of 'cvPyrSegmentation' [-Werror=nested-externs] https://bugzilla.gnome.org/show_bug.cgi?id=687237
-rw-r--r--ext/opencv/gstpyramidsegment.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/ext/opencv/gstpyramidsegment.h b/ext/opencv/gstpyramidsegment.h
index 5c210ca85..47123f495 100644
--- a/ext/opencv/gstpyramidsegment.h
+++ b/ext/opencv/gstpyramidsegment.h
@@ -49,6 +49,10 @@
#include <gst/gst.h>
#include <cv.h>
+#if CV_MAJOR_VERSION * 100 + CV_MINOR_VERSION >= 204
+#include <opencv2/legacy/legacy.hpp>
+#endif
+
G_BEGIN_DECLS
/* #defines don't like whitespacey bits */
#define GST_TYPE_PYRAMID_SEGMENT \