diff options
| author | Руслан Ижбулатов <lrn1986@gmail.com> | 2015-04-11 16:53:38 +0000 |
|---|---|---|
| committer | Sebastian Dröge <sebastian@centricular.com> | 2015-04-17 18:34:22 +0200 |
| commit | 589407a077fb645d805b86494d9d7fc56a104a64 (patch) | |
| tree | 7d9a53da36286b53c95e8074019d98cafc197dfc /ext/opencv | |
| parent | 64080e632d7e86b218f2595bcc7b3a9199c1bc4a (diff) | |
| download | gstreamer-plugins-bad-589407a077fb645d805b86494d9d7fc56a104a64.tar.gz | |
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
Diffstat (limited to 'ext/opencv')
40 files changed, 50 insertions, 24 deletions
diff --git a/ext/opencv/MotionCells.cpp b/ext/opencv/MotionCells.cpp index 449fe24ee..eaa013f00 100644 --- 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 () { diff --git a/ext/opencv/MotionCells.h b/ext/opencv/MotionCells.h index 5c6d1317c..41bb9c747 100644 --- 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 diff --git a/ext/opencv/gstcvdilate.c b/ext/opencv/gstcvdilate.c index 3b55f45a8..da0713d52 100644 --- 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 diff --git a/ext/opencv/gstcvdilate.h b/ext/opencv/gstcvdilate.h index 21c3fbf9f..fdacdd8bc 100644 --- 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 diff --git a/ext/opencv/gstcvdilateerode.h b/ext/opencv/gstcvdilateerode.h index 20b55a682..94425f541 100644 --- 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 diff --git a/ext/opencv/gstcvequalizehist.c b/ext/opencv/gstcvequalizehist.c index 5c6526a07..7384df123 100644 --- 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 diff --git a/ext/opencv/gstcvequalizehist.h b/ext/opencv/gstcvequalizehist.h index 0be379d97..d1d600d88 100644 --- 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 diff --git a/ext/opencv/gstcverode.c b/ext/opencv/gstcverode.c index a869a8471..4c6262464 100644 --- 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 diff --git a/ext/opencv/gstcverode.h b/ext/opencv/gstcverode.h index bc474f3a9..3f2944a7c 100644 --- 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 diff --git a/ext/opencv/gstcvlaplace.c b/ext/opencv/gstcvlaplace.c index bd71ae63d..5b956189f 100644 --- 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 diff --git a/ext/opencv/gstcvlaplace.h b/ext/opencv/gstcvlaplace.h index 93201e40e..098b347de 100644 --- 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 diff --git a/ext/opencv/gstcvsmooth.c b/ext/opencv/gstcvsmooth.c index ec36173e0..67f403e91 100644 --- 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 diff --git a/ext/opencv/gstcvsmooth.h b/ext/opencv/gstcvsmooth.h index 16521d97a..9a62e9136 100644 --- 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 diff --git a/ext/opencv/gstcvsobel.c b/ext/opencv/gstcvsobel.c index cd2118981..1d9b151ee 100644 --- 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 diff --git a/ext/opencv/gstcvsobel.h b/ext/opencv/gstcvsobel.h index 55885d340..c6719a0a4 100644 --- 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 diff --git a/ext/opencv/gstdisparity.h b/ext/opencv/gstdisparity.h index a1e0bdc03..adbb9ae79 100644 --- 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 diff --git a/ext/opencv/gstedgedetect.c b/ext/opencv/gstedgedetect.c index bb85de4c0..14781bd68 100644 --- 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 diff --git a/ext/opencv/gstedgedetect.h b/ext/opencv/gstedgedetect.h index 065dccfdc..23c95e69b 100644 --- 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 */ diff --git a/ext/opencv/gstfaceblur.c b/ext/opencv/gstfaceblur.c index cadeaedb4..11d914540 100644 --- 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 diff --git a/ext/opencv/gstfaceblur.h b/ext/opencv/gstfaceblur.h index a6ee28e64..23fa7fcbd 100644 --- 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" diff --git a/ext/opencv/gstfacedetect.c b/ext/opencv/gstfacedetect.c index fa01268b5..0f9425b7b 100644 --- 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 diff --git a/ext/opencv/gstfacedetect.h b/ext/opencv/gstfacedetect.h index 090fb7958..6db7033e2 100644 --- 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) diff --git a/ext/opencv/gstgrabcut.cpp b/ext/opencv/gstgrabcut.cpp index 8b573069a..c9ff4f961 100644 --- 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 diff --git a/ext/opencv/gstgrabcut.h b/ext/opencv/gstgrabcut.h index ec7dc96ce..de988bbc7 100644 --- 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 */ diff --git a/ext/opencv/gsthanddetect.c b/ext/opencv/gsthanddetect.c index d01a42ee6..0faab5942 100644 --- 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 diff --git a/ext/opencv/gsthanddetect.h b/ext/opencv/gsthanddetect.h index 129784f92..e57f56737 100644 --- 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 diff --git a/ext/opencv/gstmotioncells.h b/ext/opencv/gstmotioncells.h index 6d4b123fd..08eed3e5a 100644 --- 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 */ diff --git a/ext/opencv/gstopencvutils.c b/ext/opencv/gstopencvutils.c index 6655b07c4..89901bfef 100644 --- 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, diff --git a/ext/opencv/gstopencvutils.h b/ext/opencv/gstopencvutils.h index 82a2795ca..84123f12a 100644 --- 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); diff --git a/ext/opencv/gstopencvvideofilter.h b/ext/opencv/gstopencvvideofilter.h index fce3b320f..7fbafe932 100644 --- 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 */ diff --git a/ext/opencv/gstpyramidsegment.h b/ext/opencv/gstpyramidsegment.h index 7d7bcf5e6..586ef2cde 100644 --- 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> diff --git a/ext/opencv/gstretinex.c b/ext/opencv/gstretinex.c index 8c64b803f..5bc112a56 100644 --- 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 diff --git a/ext/opencv/gstretinex.h b/ext/opencv/gstretinex.h index 24a7c5e30..c53d230fb 100644 --- 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 */ diff --git a/ext/opencv/gstsegmentation.cpp b/ext/opencv/gstsegmentation.cpp index ec03b8023..79cbb49ca 100644 --- 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 diff --git a/ext/opencv/gstsegmentation.h b/ext/opencv/gstsegmentation.h index 03577702c..940085311 100644 --- 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 */ diff --git a/ext/opencv/gstskindetect.c b/ext/opencv/gstskindetect.c index 9cd5633e9..caf38ecd0 100644 --- 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 diff --git a/ext/opencv/gstskindetect.h b/ext/opencv/gstskindetect.h index 978983426..910d22ed4 100644 --- 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 diff --git a/ext/opencv/gsttemplatematch.c b/ext/opencv/gsttemplatematch.c index 602dd8e91..3c9784103 100644 --- 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 diff --git a/ext/opencv/gsttemplatematch.h b/ext/opencv/gsttemplatematch.h index 6b6700028..44d3d9c96 100644 --- 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 diff --git a/ext/opencv/gsttextoverlay.h b/ext/opencv/gsttextoverlay.h index cf59b3525..1fe8d2258 100644 --- 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 */ |