Commit 5ea1694e authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

OpenCV example: move to C++ and opencv2 APIs

parent 8acf84f1
...@@ -1749,7 +1749,7 @@ PKG_ENABLE_MODULES_VLC([BLURAY], [libbluray], [libbluray >= 0.2.1], (libbluray f ...@@ -1749,7 +1749,7 @@ PKG_ENABLE_MODULES_VLC([BLURAY], [libbluray], [libbluray >= 0.2.1], (libbluray f
dnl dnl
dnl OpenCV wrapper and example filters dnl OpenCV wrapper and example filters
dnl dnl
PKG_ENABLE_MODULES_VLC([OPENCV], [opencv_example opencv_wrapper], [opencv], (OpenCV (computer vision) filter), [auto]) PKG_ENABLE_MODULES_VLC([OPENCV], [opencv_example opencv_wrapper], [opencv > 2.0], (OpenCV (computer vision) filter), [auto])
dnl dnl
......
...@@ -62,7 +62,7 @@ SOURCES_gradient = gradient.c ...@@ -62,7 +62,7 @@ SOURCES_gradient = gradient.c
SOURCES_ball = ball.c SOURCES_ball = ball.c
SOURCES_panoramix = panoramix.c SOURCES_panoramix = panoramix.c
SOURCES_opencv_wrapper = opencv_wrapper.c SOURCES_opencv_wrapper = opencv_wrapper.c
SOURCES_opencv_example = opencv_example.c filter_event_info.h SOURCES_opencv_example = opencv_example.cpp filter_event_info.h
SOURCES_rotate = rotate.c SOURCES_rotate = rotate.c
SOURCES_puzzle = puzzle.c SOURCES_puzzle = puzzle.c
SOURCES_colorthres = colorthres.c SOURCES_colorthres = colorthres.c
......
...@@ -39,8 +39,9 @@ ...@@ -39,8 +39,9 @@
#include <vlc_image.h> #include <vlc_image.h>
#include "filter_event_info.h" #include "filter_event_info.h"
#include <cxcore.h> #include <opencv2/core/core_c.h>
#include <cv.h> #include <opencv2/core/core.hpp>
#include <opencv2/objdetect/objdetect.hpp>
/***************************************************************************** /*****************************************************************************
* filter_sys_t : filter descriptor * filter_sys_t : filter descriptor
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment