opencv: Updated to use new header path

2024-09-30 15:52:32 +00:00 · 2018-08-02 11:03:47 -04:00 · 2018-08-02 11:03:47 -04:00 · 9c91282ba6
commit 9c91282ba6
parent cabf875098
27 changed files with 36 additions and 41 deletions
--- a/ext/opencv/MotionCells.h
+++ b/ext/opencv/MotionCells.h
@ -45,12 +45,12 @@
 #ifndef MOTIONCELLS_H_
 #define MOTIONCELLS_H_

-#include <opencv2/core/core_c.h>
+#include <opencv2/core.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
+#include <opencv2/highgui.hpp>            // includes highGUI definitions
 #endif
 #include <fstream>
 #include <vector>
--- a/ext/opencv/gstcameracalibrate.h
+++ b/ext/opencv/gstcameracalibrate.h
@ -48,7 +48,7 @@

 #include <gst/opencv/gstopencvvideofilter.h>

-#include <opencv2/core/core.hpp>
+#include <opencv2/core.hpp>

 G_BEGIN_DECLS

--- a/ext/opencv/gstcameraundistort.h
+++ b/ext/opencv/gstcameraundistort.h
@ -48,7 +48,7 @@

 #include <gst/opencv/gstopencvvideofilter.h>

-#include <opencv2/core/core.hpp>
+#include <opencv2/core.hpp>

 G_BEGIN_DECLS

--- a/ext/opencv/gstcvdilate.cpp
+++ b/ext/opencv/gstcvdilate.cpp
@ -59,7 +59,7 @@
 #endif

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

 GST_DEBUG_CATEGORY_STATIC (gst_cv_dilate_debug);
 #define GST_CAT_DEFAULT gst_cv_dilate_debug
--- a/ext/opencv/gstcvdilateerode.cpp
+++ b/ext/opencv/gstcvdilateerode.cpp
@ -53,7 +53,7 @@
 #include "gst/opencv/gstopencvutils.h"
 #include "gstcvdilateerode.h"

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

 /*
 GST_DEBUG_CATEGORY_STATIC (gst_cv_dilate_erode_debug);
--- a/ext/opencv/gstcvequalizehist.cpp
+++ b/ext/opencv/gstcvequalizehist.cpp
@ -61,7 +61,7 @@
 #endif

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

 GST_DEBUG_CATEGORY_STATIC (gst_cv_equalize_hist_debug);
 #define GST_CAT_DEFAULT gst_cv_equalize_hist_debug
--- a/ext/opencv/gstcverode.cpp
+++ b/ext/opencv/gstcverode.cpp
@ -59,7 +59,7 @@
 #endif

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

 GST_DEBUG_CATEGORY_STATIC (gst_cv_erode_debug);
 #define GST_CAT_DEFAULT gst_cv_erode_debug
--- a/ext/opencv/gstcvlaplace.cpp
+++ b/ext/opencv/gstcvlaplace.cpp
@ -59,7 +59,7 @@
 #endif

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

 GST_DEBUG_CATEGORY_STATIC (gst_cv_laplace_debug);
 #define GST_CAT_DEFAULT gst_cv_laplace_debug
--- a/ext/opencv/gstcvsmooth.cpp
+++ b/ext/opencv/gstcvsmooth.cpp
@ -60,7 +60,7 @@

 #include "gst/opencv/gstopencvutils.h"
 #include "gstcvsmooth.h"
-#include <opencv2/imgproc/imgproc.hpp>
+#include <opencv2/imgproc.hpp>


 GST_DEBUG_CATEGORY_STATIC (gst_cv_smooth_debug);
--- a/ext/opencv/gstcvsobel.cpp
+++ b/ext/opencv/gstcvsobel.cpp
@ -59,7 +59,7 @@
 #endif

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

 GST_DEBUG_CATEGORY_STATIC (gst_cv_sobel_debug);
 #define GST_CAT_DEFAULT gst_cv_sobel_debug
--- a/ext/opencv/gstdewarp.h
+++ b/ext/opencv/gstdewarp.h
@ -47,8 +47,8 @@

 #include <gst/gst.h>
 #include <gst/opencv/gstopencvvideofilter.h>
-#include <opencv2/core/core.hpp>
-#include <opencv2/imgproc/imgproc.hpp>
+#include <opencv2/core.hpp>
+#include <opencv2/imgproc.hpp>

 G_BEGIN_DECLS
 /* #defines don't like whitespacey bits */
--- a/ext/opencv/gstedgedetect.cpp
+++ b/ext/opencv/gstedgedetect.cpp
@ -61,7 +61,7 @@
 #endif

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

 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/opencv/gstopencvvideofilter.h>
-#include <opencv2/core/core_c.h>
+#include <opencv2/core.hpp>

 G_BEGIN_DECLS
 /* #defines don't like whitespacey bits */
--- a/ext/opencv/gstfaceblur.cpp
+++ b/ext/opencv/gstfaceblur.cpp
@ -64,8 +64,7 @@
 #include <vector>

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

 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,10 +48,10 @@
 #define __GST_FACE_BLUR_H__

 #include <gst/gst.h>
-#include <opencv2/core/version.hpp>
-
 #include <gst/opencv/gstopencvvideofilter.h>
-#include <opencv2/objdetect/objdetect.hpp>
+
+#include <opencv2/core.hpp>
+#include <opencv2/objdetect.hpp>

 G_BEGIN_DECLS
 /* #defines don't like whitespacey bits */
--- a/ext/opencv/gstfacedetect.h
+++ b/ext/opencv/gstfacedetect.h
@ -49,10 +49,10 @@
 #define __GST_FACE_DETECT_H__

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

 G_BEGIN_DECLS
 /* #defines don't like whitespacey bits */
--- a/ext/opencv/gstgrabcut.cpp
+++ b/ext/opencv/gstgrabcut.cpp
@ -85,11 +85,8 @@
 #endif

 #include "gstgrabcut.h"
-extern "C"
-{
-#include <opencv2/imgproc/imgproc_c.h>
-}
-#include <opencv2/imgproc/imgproc.hpp>
+#include <opencv2/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
@ -48,7 +48,7 @@
 #include <gst/video/video.h>
 #include <gst/video/gstvideofilter.h>
 #include <gst/opencv/gstopencvvideofilter.h>
-#include <opencv2/core/core_c.h>
+#include <opencv2/core.hpp>



--- a/ext/opencv/gsthanddetect.h
+++ b/ext/opencv/gsthanddetect.h
@ -49,14 +49,14 @@

 #include <gst/opencv/gstopencvvideofilter.h>
 /* opencv */
-#include <opencv2/core/version.hpp>
+#include <opencv2/core.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
+#include <opencv2/highgui.hpp>            // includes highGUI definitions
 #endif
-#include <opencv2/objdetect/objdetect.hpp>
+#include <opencv2/objdetect.hpp>

 G_BEGIN_DECLS
 /* #defines don't like whitespacey bits */
--- a/ext/opencv/gstmotioncells.h
+++ b/ext/opencv/gstmotioncells.h
@ -46,7 +46,7 @@
 #define __GST_MOTIONCELLS_H__

 #include <gst/opencv/gstopencvvideofilter.h>
-#include <opencv2/core/core_c.h>
+#include <opencv2/core.hpp>
 #include "motioncells_wrapper.h"

 G_BEGIN_DECLS
--- a/ext/opencv/gstretinex.cpp
+++ b/ext/opencv/gstretinex.cpp
@ -63,8 +63,7 @@
 #endif

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

 GST_DEBUG_CATEGORY_STATIC (gst_retinex_debug);
 #define GST_CAT_DEFAULT gst_retinex_debug
--- a/ext/opencv/gstretinex.h
+++ b/ext/opencv/gstretinex.h
@ -44,7 +44,7 @@
 #ifndef __GST_RETINEX_H__
 #define __GST_RETINEX_H__

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

 #include <gst/opencv/gstopencvvideofilter.h>

--- a/ext/opencv/gstsegmentation.cpp
+++ b/ext/opencv/gstsegmentation.cpp
@ -91,7 +91,7 @@
 #endif

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

 GST_DEBUG_CATEGORY_STATIC (gst_segmentation_debug);
 #define GST_CAT_DEFAULT gst_segmentation_debug
--- a/ext/opencv/gstskindetect.cpp
+++ b/ext/opencv/gstskindetect.cpp
@ -59,7 +59,7 @@
 #endif

 #include "gstskindetect.h"
-#include <opencv2/imgproc/imgproc_c.h>
+#include <opencv2/imgproc.hpp>

 GST_DEBUG_CATEGORY_STATIC (gst_skin_detect_debug);
 #define GST_CAT_DEFAULT gst_skin_detect_debug
--- a/ext/opencv/gsttemplatematch.h
+++ b/ext/opencv/gsttemplatematch.h
@ -52,7 +52,7 @@
 #include <highgui.h>            // includes highGUI definitions
 #endif
 #ifdef HAVE_OPENCV2_HIGHGUI_HIGHGUI_C_H
-#include <opencv2/highgui/highgui_c.h>            // includes highGUI definitions
+#include <opencv2/highgui.hpp>            // includes highGUI definitions
 #endif

 G_BEGIN_DECLS
--- a/gst-libs/gst/opencv/gstopencvutils.cpp
+++ b/gst-libs/gst/opencv/gstopencvutils.cpp
@ -24,7 +24,7 @@
 #endif

 #include "gstopencvutils.h"
-#include <opencv2/core/core_c.h>
+#include <opencv2/core.hpp>

 /*
 The various opencv image containers or headers store the following information:
--- a/gst-libs/gst/opencv/gstopencvvideofilter.cpp
+++ b/gst-libs/gst/opencv/gstopencvvideofilter.cpp
@ -50,7 +50,7 @@
 #include "gstopencvvideofilter.h"
 #include "gstopencvutils.h"

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

 GST_DEBUG_CATEGORY_STATIC (gst_opencv_video_filter_debug);
 #define GST_CAT_DEFAULT gst_opencv_video_filter_debug