vlc | branch: master | Jean-Baptiste Kempf <[email protected]> | Mon Aug 13 17:53:28 2012 +0200| [5ea1694ee914b958e720f00a2af2d7b2a5c2d59d] | committer: Jean-Baptiste Kempf
OpenCV example: move to C++ and opencv2 APIs > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=5ea1694ee914b958e720f00a2af2d7b2a5c2d59d --- configure.ac | 2 +- modules/video_filter/Modules.am | 2 +- modules/video_filter/{opencv_example.c => opencv_example.cpp} | 5 +++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 1704509..e536ecd 100644 --- a/configure.ac +++ b/configure.ac @@ -1749,7 +1749,7 @@ PKG_ENABLE_MODULES_VLC([BLURAY], [libbluray], [libbluray >= 0.2.1], (libbluray f dnl dnl OpenCV wrapper and example filters 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 diff --git a/modules/video_filter/Modules.am b/modules/video_filter/Modules.am index 0585d6f..9b559b1 100644 --- a/modules/video_filter/Modules.am +++ b/modules/video_filter/Modules.am @@ -62,7 +62,7 @@ SOURCES_gradient = gradient.c SOURCES_ball = ball.c SOURCES_panoramix = panoramix.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_puzzle = puzzle.c SOURCES_colorthres = colorthres.c diff --git a/modules/video_filter/opencv_example.c b/modules/video_filter/opencv_example.cpp similarity index 98% rename from modules/video_filter/opencv_example.c rename to modules/video_filter/opencv_example.cpp index bec3997..ce10b0d 100644 --- a/modules/video_filter/opencv_example.c +++ b/modules/video_filter/opencv_example.cpp @@ -39,8 +39,9 @@ #include <vlc_image.h> #include "filter_event_info.h" -#include <cxcore.h> -#include <cv.h> +#include <opencv2/core/core_c.h> +#include <opencv2/core/core.hpp> +#include <opencv2/objdetect/objdetect.hpp> /***************************************************************************** * filter_sys_t : filter descriptor _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
