mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-11-05 17:09:48 +00:00
opencv: Updated to use new header path
This commit is contained in:
parent
cabf875098
commit
9c91282ba6
27 changed files with 36 additions and 41 deletions
|
@ -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>
|
||||
|
|
|
@ -48,7 +48,7 @@
|
|||
|
||||
#include <gst/opencv/gstopencvvideofilter.h>
|
||||
|
||||
#include <opencv2/core/core.hpp>
|
||||
#include <opencv2/core.hpp>
|
||||
|
||||
G_BEGIN_DECLS
|
||||
|
||||
|
|
|
@ -48,7 +48,7 @@
|
|||
|
||||
#include <gst/opencv/gstopencvvideofilter.h>
|
||||
|
||||
#include <opencv2/core/core.hpp>
|
||||
#include <opencv2/core.hpp>
|
||||
|
||||
G_BEGIN_DECLS
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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 */
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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 */
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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 */
|
||||
|
|
|
@ -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 */
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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>
|
||||
|
||||
|
||||
|
||||
|
|
|
@ -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 */
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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>
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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:
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue