mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-18 15:51:11 +00:00
Code Issues 1 Projects Releases Wiki Activity

opencv: Updated to use new header path

Browse source
This commit is contained in:
Nicolas Dufresne 2018-08-02 11:03:47 -04:00
parent cabf875098
commit 9c91282ba6
27 changed files with 36 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ext/opencv/MotionCells.h
View file

@ -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>

2
ext/opencv/gstcameracalibrate.h
View file

@ -48,7 +48,7 @@
#include <gst/opencv/gstopencvvideofilter.h>
#include <opencv2/core/core.hpp>
#include <opencv2/core.hpp>
G_BEGIN_DECLS

2
ext/opencv/gstcameraundistort.h
View file

@ -48,7 +48,7 @@
#include <gst/opencv/gstopencvvideofilter.h>
#include <opencv2/core/core.hpp>
#include <opencv2/core.hpp>
G_BEGIN_DECLS

2
ext/opencv/gstcvdilate.cpp
View file

@ -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

2
ext/opencv/gstcvdilateerode.cpp
View file

@ -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);

2
ext/opencv/gstcvequalizehist.cpp
View file

@ -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

2
ext/opencv/gstcverode.cpp
View file

@ -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

2
ext/opencv/gstcvlaplace.cpp
View file

@ -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

2
ext/opencv/gstcvsmooth.cpp
View file

@ -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);

2
ext/opencv/gstcvsobel.cpp
View file

@ -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

4
ext/opencv/gstdewarp.h
View file

@ -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 */

2
ext/opencv/gstedgedetect.cpp
View file

@ -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

2
ext/opencv/gstedgedetect.h
View file

@ -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 */

3
ext/opencv/gstfaceblur.cpp
View file

@ -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

6
ext/opencv/gstfaceblur.h
View file

@ -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 */

6
ext/opencv/gstfacedetect.h
View file

@ -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 */

7
ext/opencv/gstgrabcut.cpp
View file

@ -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

2
ext/opencv/gstgrabcut.h
View file

@ -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>

6
ext/opencv/gsthanddetect.h
View file

@ -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 */

2
ext/opencv/gstmotioncells.h
View file

@ -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

3
ext/opencv/gstretinex.cpp
View file

@ -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

2
ext/opencv/gstretinex.h
View file

@ -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>

2
ext/opencv/gstsegmentation.cpp
View file

@ -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

2
ext/opencv/gstskindetect.cpp
View file

@ -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

2
ext/opencv/gsttemplatematch.h
View file

@ -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

2
gst-libs/gst/opencv/gstopencvutils.cpp
View file

@ -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:

2
gst-libs/gst/opencv/gstopencvvideofilter.cpp
View file

@ -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