opencv: clean includes

The opencv element includes were full of duplicates and uneeded headers. For example a few elements that stopped using gstcvopencvutils still included that header file.
2025-01-11 01:45:33 +00:00 · 2015-12-12 20:07:32 +00:00 · 2015-12-12 20:07:32 +00:00 · 447c1b1395
commit 447c1b1395
parent 892d8d515f
36 changed files with 151 additions and 220 deletions
--- a/ext/opencv/gstcvdilate.cpp
+++ b/ext/opencv/gstcvdilate.cpp
@ -45,8 +45,6 @@
 #  include <config.h>
 #endif

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

--- a/ext/opencv/gstcvdilateerode.cpp
+++ b/ext/opencv/gstcvdilateerode.cpp
@ -50,8 +50,6 @@
 #  include <config.h>
 #endif

-#include <gst/gst.h>
-
 #include "gstopencvutils.h"
 #include "gstcvdilateerode.h"

--- a/ext/opencv/gstcvdilateerode.h
+++ b/ext/opencv/gstcvdilateerode.h
@ -44,8 +44,6 @@
 #ifndef __GST_CV_DILATE_ERODE_H__
 #define __GST_CV_DILATE_ERODE_H__

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

 G_BEGIN_DECLS
--- a/ext/opencv/gstcvequalizehist.cpp
+++ b/ext/opencv/gstcvequalizehist.cpp
@ -45,9 +45,6 @@
 #  include <config.h>
 #endif

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

--- a/ext/opencv/gstcvequalizehist.h
+++ b/ext/opencv/gstcvequalizehist.h
@ -44,8 +44,6 @@
 #ifndef __GST_CV_EQUALIZE_HIST_H__
 #define __GST_CV_EQUALIZE_HIST_H__

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

 G_BEGIN_DECLS
--- a/ext/opencv/gstcverode.cpp
+++ b/ext/opencv/gstcverode.cpp
@ -45,8 +45,6 @@
 #  include <config.h>
 #endif

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

--- a/ext/opencv/gstcvlaplace.cpp
+++ b/ext/opencv/gstcvlaplace.cpp
@ -45,9 +45,6 @@
 #  include <config.h>
 #endif

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

--- a/ext/opencv/gstcvlaplace.h
+++ b/ext/opencv/gstcvlaplace.h
@ -44,8 +44,6 @@
 #ifndef __GST_CV_LAPLACE_H__
 #define __GST_CV_LAPLACE_H__

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

 G_BEGIN_DECLS
--- a/ext/opencv/gstcvsmooth.cpp
+++ b/ext/opencv/gstcvsmooth.cpp
@ -45,8 +45,6 @@
 #  include <config.h>
 #endif

-#include <gst/gst.h>
-
 #include "gstopencvutils.h"
 #include "gstcvsmooth.h"
 #include <opencv2/imgproc/imgproc_c.h>
--- a/ext/opencv/gstcvsmooth.h
+++ b/ext/opencv/gstcvsmooth.h
@ -44,8 +44,6 @@
 #ifndef __GST_CV_SMOOTH_H__
 #define __GST_CV_SMOOTH_H__

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

 G_BEGIN_DECLS
--- a/ext/opencv/gstcvsobel.cpp
+++ b/ext/opencv/gstcvsobel.cpp
@ -45,9 +45,6 @@
 #  include <config.h>
 #endif

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

--- a/ext/opencv/gstcvsobel.h
+++ b/ext/opencv/gstcvsobel.h
@ -44,8 +44,6 @@
 #ifndef __GST_CV_SOBEL_H__
 #define __GST_CV_SOBEL_H__

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

 G_BEGIN_DECLS
--- a/ext/opencv/gstdisparity.cpp
+++ b/ext/opencv/gstdisparity.cpp
@ -119,8 +119,6 @@ gst-launch-1.0    multifilesrc  location=~/im3.png ! pngdec ! videoconvert  ! di
 #include <config.h>
 #endif

-#include <gst/gst.h>
-#include <gst/video/video.h>
 #include <opencv2/contrib/contrib.hpp>
 #include "gstdisparity.h"

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

 #include <gst/gst.h>
+#include <gst/video/video.h>

 #include <opencv2/legacy/legacy.hpp>

--- a/ext/opencv/gstedgedetect.cpp
+++ b/ext/opencv/gstedgedetect.cpp
@ -60,9 +60,6 @@
 #  include <config.h>
 #endif

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

--- a/ext/opencv/gstedgedetect.h
+++ b/ext/opencv/gstedgedetect.h
@ -47,6 +47,7 @@
 #define __GST_EDGE_DETECT_H__

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

 G_BEGIN_DECLS
--- a/ext/opencv/gstfaceblur.cpp
+++ b/ext/opencv/gstfaceblur.cpp
@ -61,10 +61,8 @@
 #  include <config.h>
 #endif

-#include <gst/gst.h>
 #include <vector>

-#include "gstopencvutils.h"
 #include "gstfaceblur.h"
 #include <opencv2/imgproc/imgproc_c.h>
 #include <opencv2/imgproc/imgproc.hpp>
--- a/ext/opencv/gstfacedetect.cpp
+++ b/ext/opencv/gstfacedetect.cpp
@ -76,11 +76,8 @@
 #  include <config.h>
 #endif

-#include <gst/gst.h>
-#include <gst/video/gstvideometa.h>
 #include <vector>

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

--- a/ext/opencv/gstgrabcut.cpp
+++ b/ext/opencv/gstgrabcut.cpp
@ -84,11 +84,9 @@
 #include <config.h>
 #endif

-#include <gst/gst.h>
 #include "gstgrabcut.h"
 extern "C"
 {
-#include <gst/video/gstvideometa.h>
 #include <opencv2/imgproc/imgproc_c.h>
 }
 #include <opencv2/imgproc/imgproc.hpp>
--- a/ext/opencv/gsthanddetect.cpp
+++ b/ext/opencv/gsthanddetect.cpp
@ -62,7 +62,6 @@

 /* element header */
 #include "gsthanddetect.h"
-#include "gstopencvutils.h"
 #include <opencv2/imgproc/imgproc_c.h>

 GST_DEBUG_CATEGORY_STATIC (gst_handdetect_debug);
--- a/ext/opencv/gsthanddetect.h
+++ b/ext/opencv/gsthanddetect.h
@ -45,10 +45,6 @@
 #ifndef __GST_HANDDETECT_H__
 #define __GST_HANDDETECT_H__

-#include <gst/gst.h>
-#include <gst/video/video.h>
-#include <gst/video/navigation.h>
-
 #include <cv.h>

 #include "gstopencvvideofilter.h"
--- a/ext/opencv/gstmotioncells.cpp
+++ b/ext/opencv/gstmotioncells.cpp
@ -59,15 +59,7 @@
 #  include <config.h>
 #endif

-#include <stdio.h>
-#include <string.h>
-#include <sys/time.h>
-#include <time.h>
-#include <limits.h>
-
-#include <glib.h>
 #include "gstmotioncells.h"
-#include <gst/video/video.h>

 GST_DEBUG_CATEGORY_STATIC (gst_motion_cells_debug);
 #define GST_CAT_DEFAULT gst_motion_cells_debug
--- a/ext/opencv/gstmotioncells.h
+++ b/ext/opencv/gstmotioncells.h
@ -46,6 +46,7 @@
 #define __GST_MOTIONCELLS_H__

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

--- a/ext/opencv/gstopencvvideofilter.cpp
+++ b/ext/opencv/gstopencvvideofilter.cpp
@ -47,8 +47,6 @@
 #  include <config.h>
 #endif

-#include <gst/gst.h>
-
 #include "gstopencvvideofilter.h"
 #include "gstopencvutils.h"

--- a/ext/opencv/gstpyramidsegment.cpp
+++ b/ext/opencv/gstpyramidsegment.cpp
@ -60,9 +60,6 @@
 #  include <config.h>
 #endif

-#include <gst/gst.h>
-
-#include "gstopencvutils.h"
 #include "gstpyramidsegment.h"

 #define BLOCK_SIZE 1000
--- a/ext/opencv/gstpyramidsegment.h
+++ b/ext/opencv/gstpyramidsegment.h
@ -47,6 +47,7 @@
 #define __GST_PYRAMID_SEGMENT_H__

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

 #if CV_MAJOR_VERSION * 100 + CV_MINOR_VERSION >= 204
--- a/ext/opencv/gstretinex.cpp
+++ b/ext/opencv/gstretinex.cpp
@ -62,7 +62,6 @@
 #include <config.h>
 #endif

-#include <gst/gst.h>
 #include "gstretinex.h"
 #include <opencv2/imgproc/imgproc_c.h>
 #include <opencv2/imgproc/imgproc.hpp>
--- a/ext/opencv/gstretinex.h
+++ b/ext/opencv/gstretinex.h
@ -44,9 +44,6 @@
 #ifndef __GST_RETINEX_H__
 #define __GST_RETINEX_H__

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

 #include <gstopencvvideofilter.h>
--- a/ext/opencv/gstsegmentation.cpp
+++ b/ext/opencv/gstsegmentation.cpp
@ -90,8 +90,6 @@
 #include <config.h>
 #endif

-#include <gst/gst.h>
-
 #include "gstsegmentation.h"
 #include <opencv2/video/background_segm.hpp>
 #include <opencv2/imgproc/imgproc_c.h>
--- a/ext/opencv/gstskindetect.cpp
+++ b/ext/opencv/gstskindetect.cpp
@ -58,9 +58,6 @@
 #include <config.h>
 #endif

-#include <gst/gst.h>
-
-#include "gstopencvutils.h"
 #include "gstskindetect.h"
 #include <opencv2/imgproc/imgproc_c.h>
 #include <opencv2/legacy/compat.hpp>
--- a/ext/opencv/gstskindetect.h
+++ b/ext/opencv/gstskindetect.h
@ -46,8 +46,6 @@
 #ifndef __GST_SKIN_DETECT_H__
 #define __GST_SKIN_DETECT_H__

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

 G_BEGIN_DECLS
--- a/ext/opencv/gsttemplatematch.cpp
+++ b/ext/opencv/gsttemplatematch.cpp
@ -61,10 +61,7 @@
 #  include <config.h>
 #endif

-#include <gst/gst.h>
-
 #include "../../gst-libs/gst/gst-i18n-plugin.h"
-#include "gstopencvutils.h"
 #include "gsttemplatematch.h"
 #include <opencv2/imgproc/imgproc_c.h>

--- a/ext/opencv/gsttemplatematch.h
+++ b/ext/opencv/gsttemplatematch.h
@ -47,6 +47,7 @@
 #define __GST_TEMPLATE_MATCH_H__

 #include <gst/gst.h>
+#include <gst/video/video.h>

 #ifdef HAVE_HIGHGUI_H
 #include <highgui.h>            // includes highGUI definitions
--- a/ext/opencv/gsttextoverlay.cpp
+++ b/ext/opencv/gsttextoverlay.cpp
@ -60,9 +60,6 @@
 #  include <config.h>
 #endif

-#include <gst/gst.h>
-
-#include "gstopencvutils.h"
 #include "gsttextoverlay.h"

 GST_DEBUG_CATEGORY_STATIC (gst_opencv_text_overlay_debug);
--- a/ext/opencv/gsttextoverlay.h
+++ b/ext/opencv/gsttextoverlay.h
@ -47,7 +47,7 @@
 #define __GST_OPENCV_TEXT_OVERLAY_H__

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