opencv: Change opencv plugin to use opencv2-style includes

If old opencv1-style legacy include directory is available, this change becomes purely cosmetic (maybe will compile a bit faster). It becomes an FTBFS fix when opencv1-style include directory is missing (possibly because opencv package maintainer decided not to pack it). https://bugzilla.gnome.org/show_bug.cgi?id=747705
2024-11-27 04:01:08 +00:00 · 2015-04-11 16:53:38 +00:00 · 2015-04-11 16:53:38 +00:00 · 589407a077
commit 589407a077
parent 64080e632d
40 changed files with 50 additions and 24 deletions
--- a/ext/opencv/MotionCells.cpp
+++ b/ext/opencv/MotionCells.cpp
@ -54,6 +54,7 @@
 #include <math.h>
 #include <gst/gst.h>
 #include "MotionCells.h"
+#include <opencv2/imgproc/imgproc_c.h>

 MotionCells::MotionCells ()
 {
--- a/ext/opencv/MotionCells.h
+++ b/ext/opencv/MotionCells.h
@ -45,7 +45,7 @@
 #ifndef MOTIONCELLS_H_
 #define MOTIONCELLS_H_

-#include <cv.h>                 // includes OpenCV definitions
+#include <opencv2/core/core_c.h>
 #ifdef HAVE_HIGHGUI_H
 #include <highgui.h>            // includes highGUI definitions
 #endif
--- a/ext/opencv/gstcvdilate.c
+++ b/ext/opencv/gstcvdilate.c
@ -48,6 +48,7 @@
 #include <gst/gst.h>

 #include "gstcvdilate.h"
+#include <opencv2/imgproc/imgproc_c.h>

 GST_DEBUG_CATEGORY_STATIC (gst_cv_dilate_debug);
 #define GST_CAT_DEFAULT gst_cv_dilate_debug
--- a/ext/opencv/gstcvdilate.h
+++ b/ext/opencv/gstcvdilate.h
@ -45,7 +45,7 @@
 #define __GST_CV_DILATE_H__

 #include <gst/gst.h>
-#include <cv.h>
+
 #include "gstcvdilateerode.h"

 G_BEGIN_DECLS
--- a/ext/opencv/gstcvdilateerode.h
+++ b/ext/opencv/gstcvdilateerode.h
@ -45,7 +45,7 @@
 #define __GST_CV_DILATE_ERODE_H__

 #include <gst/gst.h>
-#include <cv.h>
+
 #include <gstopencvvideofilter.h>

 G_BEGIN_DECLS
--- a/ext/opencv/gstcvequalizehist.c
+++ b/ext/opencv/gstcvequalizehist.c
@ -49,6 +49,7 @@

 #include "gstopencvutils.h"
 #include "gstcvequalizehist.h"
+#include <opencv2/imgproc/imgproc_c.h>

 GST_DEBUG_CATEGORY_STATIC (gst_cv_equalize_hist_debug);
 #define GST_CAT_DEFAULT gst_cv_equalize_hist_debug
--- a/ext/opencv/gstcvequalizehist.h
+++ b/ext/opencv/gstcvequalizehist.h
@ -45,7 +45,7 @@
 #define __GST_CV_EQUALIZE_HIST_H__

 #include <gst/gst.h>
-#include <cv.h>
+
 #include <gstopencvvideofilter.h>

 G_BEGIN_DECLS
--- a/ext/opencv/gstcverode.c
+++ b/ext/opencv/gstcverode.c
@ -48,6 +48,7 @@
 #include <gst/gst.h>

 #include "gstcverode.h"
+#include <opencv2/imgproc/imgproc_c.h>

 GST_DEBUG_CATEGORY_STATIC (gst_cv_erode_debug);
 #define GST_CAT_DEFAULT gst_cv_erode_debug
--- a/ext/opencv/gstcverode.h
+++ b/ext/opencv/gstcverode.h
@ -45,7 +45,7 @@
 #define __GST_CV_ERODE_H__

 #include <gst/gst.h>
-#include <cv.h>
+
 #include "gstcvdilateerode.h"

 G_BEGIN_DECLS
--- a/ext/opencv/gstcvlaplace.c
+++ b/ext/opencv/gstcvlaplace.c
@ -49,6 +49,7 @@

 #include "gstopencvutils.h"
 #include "gstcvlaplace.h"
+#include <opencv2/imgproc/imgproc_c.h>

 GST_DEBUG_CATEGORY_STATIC (gst_cv_laplace_debug);
 #define GST_CAT_DEFAULT gst_cv_laplace_debug
--- a/ext/opencv/gstcvlaplace.h
+++ b/ext/opencv/gstcvlaplace.h
@ -45,7 +45,7 @@
 #define __GST_CV_LAPLACE_H__

 #include <gst/gst.h>
-#include <cv.h>
+
 #include <gstopencvvideofilter.h>

 G_BEGIN_DECLS
--- a/ext/opencv/gstcvsmooth.c
+++ b/ext/opencv/gstcvsmooth.c
@ -49,6 +49,7 @@

 #include "gstopencvutils.h"
 #include "gstcvsmooth.h"
+#include <opencv2/imgproc/imgproc_c.h>

 GST_DEBUG_CATEGORY_STATIC (gst_cv_smooth_debug);
 #define GST_CAT_DEFAULT gst_cv_smooth_debug
--- a/ext/opencv/gstcvsmooth.h
+++ b/ext/opencv/gstcvsmooth.h
@ -45,7 +45,7 @@
 #define __GST_CV_SMOOTH_H__

 #include <gst/gst.h>
-#include <cv.h>
+
 #include <gstopencvvideofilter.h>

 G_BEGIN_DECLS
--- a/ext/opencv/gstcvsobel.c
+++ b/ext/opencv/gstcvsobel.c
@ -49,6 +49,7 @@

 #include "gstopencvutils.h"
 #include "gstcvsobel.h"
+#include <opencv2/imgproc/imgproc_c.h>

 GST_DEBUG_CATEGORY_STATIC (gst_cv_sobel_debug);
 #define GST_CAT_DEFAULT gst_cv_sobel_debug
--- a/ext/opencv/gstcvsobel.h
+++ b/ext/opencv/gstcvsobel.h
@ -45,7 +45,7 @@
 #define __GST_CV_SOBEL_H__

 #include <gst/gst.h>
-#include <cv.h>
+
 #include <gstopencvvideofilter.h>

 G_BEGIN_DECLS
--- a/ext/opencv/gstdisparity.h
+++ b/ext/opencv/gstdisparity.h
@ -45,7 +45,7 @@
 #define __GST_DISPARITY_H__

 #include <gst/gst.h>
-#include <cv.h>
+
 #include <opencv2/legacy/legacy.hpp>

 G_BEGIN_DECLS
--- a/ext/opencv/gstedgedetect.c
+++ b/ext/opencv/gstedgedetect.c
@ -64,6 +64,7 @@

 #include "gstopencvutils.h"
 #include "gstedgedetect.h"
+#include <opencv2/imgproc/imgproc_c.h>

 GST_DEBUG_CATEGORY_STATIC (gst_edge_detect_debug);
 #define GST_CAT_DEFAULT gst_edge_detect_debug
--- a/ext/opencv/gstedgedetect.h
+++ b/ext/opencv/gstedgedetect.h
@ -47,7 +47,7 @@
 #define __GST_EDGE_DETECT_H__

 #include <gst/gst.h>
-#include <cv.h>
+#include <opencv2/core/core_c.h>

 G_BEGIN_DECLS
 /* #defines don't like whitespacey bits */
--- a/ext/opencv/gstfaceblur.c
+++ b/ext/opencv/gstfaceblur.c
@ -65,6 +65,7 @@

 #include "gstopencvutils.h"
 #include "gstfaceblur.h"
+#include <opencv2/imgproc/imgproc_c.h>

 GST_DEBUG_CATEGORY_STATIC (gst_face_blur_debug);
 #define GST_CAT_DEFAULT gst_face_blur_debug
--- a/ext/opencv/gstfaceblur.h
+++ b/ext/opencv/gstfaceblur.h
@ -48,7 +48,7 @@
 #define __GST_FACE_BLUR_H__

 #include <gst/gst.h>
-#include <cv.h>
+#include <opencv2/core/version.hpp>

 #include "gstopencvvideofilter.h"

--- a/ext/opencv/gstfacedetect.c
+++ b/ext/opencv/gstfacedetect.c
@ -81,6 +81,7 @@

 #include "gstopencvutils.h"
 #include "gstfacedetect.h"
+#include <opencv2/imgproc/imgproc_c.h>

 GST_DEBUG_CATEGORY_STATIC (gst_face_detect_debug);
 #define GST_CAT_DEFAULT gst_face_detect_debug
--- a/ext/opencv/gstfacedetect.h
+++ b/ext/opencv/gstfacedetect.h
@ -49,7 +49,7 @@
 #define __GST_FACE_DETECT_H__

 #include <gst/gst.h>
-#include <cv.h>
+#include <opencv2/core/version.hpp>
 #include "gstopencvvideofilter.h"

 #if (CV_MAJOR_VERSION >= 2) && (CV_MINOR_VERSION >= 2)
--- a/ext/opencv/gstgrabcut.cpp
+++ b/ext/opencv/gstgrabcut.cpp
@ -89,7 +89,9 @@
 extern "C"
 {
 #include <gst/video/gstvideometa.h>
+#include <opencv2/imgproc/imgproc_c.h>
 }
+#include <opencv2/imgproc/imgproc.hpp>
 GST_DEBUG_CATEGORY_STATIC (gst_grabcut_debug);
 #define GST_CAT_DEFAULT gst_grabcut_debug

--- a/ext/opencv/gstgrabcut.h
+++ b/ext/opencv/gstgrabcut.h
@ -47,8 +47,9 @@
 #include <gst/gst.h>
 #include <gst/video/video.h>
 #include <gst/video/gstvideofilter.h>
+#include <opencv2/core/core_c.h>
+

-#include <cv.h>

 G_BEGIN_DECLS
 /* #defines don't like whitespacey bits */
--- a/ext/opencv/gsthanddetect.c
+++ b/ext/opencv/gsthanddetect.c
@ -63,6 +63,7 @@
 /* element header */
 #include "gsthanddetect.h"
 #include "gstopencvutils.h"
+#include <opencv2/imgproc/imgproc_c.h>

 GST_DEBUG_CATEGORY_STATIC (gst_handdetect_debug);
 #define GST_CAT_DEFAULT gst_handdetect_debug
--- a/ext/opencv/gsthanddetect.h
+++ b/ext/opencv/gsthanddetect.h
@ -51,9 +51,13 @@

 #include "gstopencvvideofilter.h"
 /* opencv */
-#include <cv.h>
-#include <cxcore.h>
-#include <highgui.h>
+#include <opencv2/core/version.hpp>
+#ifdef HAVE_HIGHGUI_H
+#include <highgui.h>            // includes highGUI definitions
+#endif
+#ifdef HAVE_OPENCV2_HIGHGUI_HIGHGUI_C_H
+#include <opencv2/highgui/highgui_c.h>            // includes highGUI definitions
+#endif
 #if (CV_MAJOR_VERSION >= 2) && (CV_MINOR_VERSION >= 2)
 #include <opencv2/objdetect/objdetect.hpp>
 #endif
--- a/ext/opencv/gstmotioncells.h
+++ b/ext/opencv/gstmotioncells.h
@ -46,7 +46,7 @@
 #define __GST_MOTIONCELLS_H__

 #include <gst/gst.h>
-#include <cv.h>
+#include <opencv2/core/core_c.h>

 G_BEGIN_DECLS
 /* #defines don't like whitespacey bits */
--- a/ext/opencv/gstopencvutils.c
+++ b/ext/opencv/gstopencvutils.c
@ -24,6 +24,7 @@
 #endif

 #include "gstopencvutils.h"
+#include <opencv2/core/types_c.h>

 static gboolean
 gst_opencv_get_ipl_depth_and_channels (GstStructure * structure,
--- a/ext/opencv/gstopencvutils.h
+++ b/ext/opencv/gstopencvutils.h
@ -29,7 +29,7 @@
 #include <gst/gst.h>
 #include <gst/video/video.h>

-#include <cv.h>
+

 gboolean
 gst_opencv_get_ipldepth (gint depth, gint bpp, gint * ipldepth);
--- a/ext/opencv/gstopencvvideofilter.h
+++ b/ext/opencv/gstopencvvideofilter.h
@ -46,7 +46,7 @@

 #include <gst/gst.h>
 #include <gst/video/gstvideofilter.h>
-#include <cv.h>
+#include <opencv2/core/core_c.h>

 G_BEGIN_DECLS
 /* #defines don't like whitespacey bits */
--- a/ext/opencv/gstpyramidsegment.h
+++ b/ext/opencv/gstpyramidsegment.h
@ -47,7 +47,7 @@
 #define __GST_PYRAMID_SEGMENT_H__

 #include <gst/gst.h>
-#include <cv.h>
+#include <opencv2/core/version.hpp>

 #if CV_MAJOR_VERSION * 100 + CV_MINOR_VERSION >= 204
 #include <opencv2/legacy/legacy.hpp>
--- a/ext/opencv/gstretinex.c
+++ b/ext/opencv/gstretinex.c
@ -64,6 +64,7 @@

 #include <gst/gst.h>
 #include "gstretinex.h"
+#include <opencv2/imgproc/imgproc_c.h>

 GST_DEBUG_CATEGORY_STATIC (gst_retinex_debug);
 #define GST_CAT_DEFAULT gst_retinex_debug
--- a/ext/opencv/gstretinex.h
+++ b/ext/opencv/gstretinex.h
@ -47,8 +47,8 @@
 #include <gst/gst.h>
 #include <gst/video/video.h>
 #include <gst/video/gstvideofilter.h>
+#include <opencv2/core/core_c.h>

-#include <cv.h>

 G_BEGIN_DECLS
 /* #defines don't like whitespacey bits */
--- a/ext/opencv/gstsegmentation.cpp
+++ b/ext/opencv/gstsegmentation.cpp
@ -94,6 +94,7 @@

 #include "gstsegmentation.h"
 #include <opencv2/video/background_segm.hpp>
+#include <opencv2/imgproc/imgproc_c.h>

 GST_DEBUG_CATEGORY_STATIC (gst_segmentation_debug);
 #define GST_CAT_DEFAULT gst_segmentation_debug
--- a/ext/opencv/gstsegmentation.h
+++ b/ext/opencv/gstsegmentation.h
@ -46,8 +46,9 @@

 #include <gst/gst.h>
 #include <gst/video/gstvideofilter.h>
+#include <opencv2/core/core_c.h>
+

-#include <cv.h>

 G_BEGIN_DECLS
 /* #defines don't like whitespacey bits */
--- a/ext/opencv/gstskindetect.c
+++ b/ext/opencv/gstskindetect.c
@ -62,6 +62,8 @@

 #include "gstopencvutils.h"
 #include "gstskindetect.h"
+#include <opencv2/imgproc/imgproc_c.h>
+#include <opencv2/legacy/compat.hpp>

 GST_DEBUG_CATEGORY_STATIC (gst_skin_detect_debug);
 #define GST_CAT_DEFAULT gst_skin_detect_debug
--- a/ext/opencv/gstskindetect.h
+++ b/ext/opencv/gstskindetect.h
@ -47,7 +47,7 @@
 #define __GST_SKIN_DETECT_H__

 #include <gst/gst.h>
-#include <cv.h>
+
 #include <gstopencvvideofilter.h>

 G_BEGIN_DECLS
--- a/ext/opencv/gsttemplatematch.c
+++ b/ext/opencv/gsttemplatematch.c
@ -66,6 +66,7 @@
 #include "../../gst-libs/gst/gst-i18n-plugin.h"
 #include "gstopencvutils.h"
 #include "gsttemplatematch.h"
+#include <opencv2/imgproc/imgproc_c.h>

 GST_DEBUG_CATEGORY_STATIC (gst_template_match_debug);
 #define GST_CAT_DEFAULT gst_template_match_debug
--- a/ext/opencv/gsttemplatematch.h
+++ b/ext/opencv/gsttemplatematch.h
@ -47,7 +47,7 @@
 #define __GST_TEMPLATE_MATCH_H__

 #include <gst/gst.h>
-#include <cv.h>
+
 #ifdef HAVE_HIGHGUI_H
 #include <highgui.h>            // includes highGUI definitions
 #endif
--- a/ext/opencv/gsttextoverlay.h
+++ b/ext/opencv/gsttextoverlay.h
@ -48,6 +48,7 @@

 #include <gst/gst.h>
 #include "gstopencvutils.h"
+#include <opencv2/core/core_c.h>
 G_BEGIN_DECLS

 /* #defines don't like whitespacey bits */