From adf25cd9b3d39656e92f81cabb990c3e72864442 Mon Sep 17 00:00:00 2001 From: Antoine Villeret Date: Fri, 21 Jun 2013 18:38:49 +0000 Subject: should not depends on libcv-dev libhighgui-dev libcvaux-dev anymore... svn path=/trunk/externals/pix_opencv/; revision=17158 --- README.txt | 2 +- pix_opencv_athreshold.h | 2 +- pix_opencv_bgstats.h | 5 +++-- pix_opencv_bgsubstract.h | 2 +- pix_opencv_blobtrack-help.pd | 4 ++-- pix_opencv_calibration.h | 2 +- pix_opencv_camshift.h | 3 ++- pix_opencv_colorfilt.h | 2 +- pix_opencv_contours.h | 2 +- pix_opencv_contours_boundingrect.h | 3 ++- pix_opencv_contours_convexhull.h | 3 ++- pix_opencv_contours_convexity.h | 3 ++- pix_opencv_dft.h | 2 +- pix_opencv_distrans.h | 2 +- pix_opencv_edge.h | 2 +- pix_opencv_findchessboardcorners.h | 2 +- pix_opencv_floodfill.h | 2 +- pix_opencv_haarcascade.h | 3 ++- pix_opencv_hist_compare.h | 3 ++- pix_opencv_hough_circles.h | 2 +- pix_opencv_hough_lines.h | 2 +- pix_opencv_hu_compare.h | 3 ++- pix_opencv_hu_moments.h | 2 +- pix_opencv_knear.h | 6 +++--- pix_opencv_laplace.h | 3 ++- pix_opencv_lk.h | 2 +- pix_opencv_matchshape.h | 2 +- pix_opencv_morphology.h | 2 +- pix_opencv_motempl.h | 5 ++++- pix_opencv_of_bm.h | 2 +- pix_opencv_of_hs.h | 2 +- pix_opencv_of_lk.h | 2 +- pix_opencv_pgh_compare.h | 4 ++-- pix_opencv_surf.h | 2 +- pix_opencv_threshold.h | 2 +- pix_opencv_warpperspective.h | 2 +- 36 files changed, 53 insertions(+), 41 deletions(-) diff --git a/README.txt b/README.txt index f877d28..e056533 100644 --- a/README.txt +++ b/README.txt @@ -13,7 +13,7 @@ pix_opencv depends on OpenCV 2.x and >1.5 (for old externals) # (actually only tested in GNU/Linux Ubuntu) # this new version requiered OpenCV 2.3, available with apt-get since 12.04 : -apt-get install libopencv-dev libcv-dev libhighgui-dev libcvaux-dev +apt-get install libopencv-dev # for other systems, you can build the lib from source, see this : # http://opencv.willowgarage.com/wiki/InstallGuide diff --git a/pix_opencv_athreshold.h b/pix_opencv_athreshold.h index f1aaade..48913a4 100644 --- a/pix_opencv_athreshold.h +++ b/pix_opencv_athreshold.h @@ -17,7 +17,7 @@ LOG #define INCLUDE_PIX_OPENCV_ATHRESHOLD_H_ #ifndef _EiC -#include "cv.h" +#include "opencv2/legacy/legacy.hpp" #endif #include "Base/GemPixObj.h" diff --git a/pix_opencv_bgstats.h b/pix_opencv_bgstats.h index 52592dd..0f791e9 100644 --- a/pix_opencv_bgstats.h +++ b/pix_opencv_bgstats.h @@ -17,8 +17,9 @@ LOG #define INCLUDE_PIX_OPENCV_BGSTATS_H #ifndef _EiC -#include "cv.h" -#include "cvaux.h" +#include "opencv2/legacy/legacy.hpp" +#include "opencv2/video/background_segm.hpp" + #endif #include "Base/GemPixObj.h" diff --git a/pix_opencv_bgsubstract.h b/pix_opencv_bgsubstract.h index 96b0dd5..bb177c4 100644 --- a/pix_opencv_bgsubstract.h +++ b/pix_opencv_bgsubstract.h @@ -17,7 +17,7 @@ LOG #define INCLUDE_PIX_OPENCV_BGSUBSTRACT_H_ #ifndef _EiC -#include "cv.h" +#include "opencv2/legacy/legacy.hpp" #endif #include "Base/GemPixObj.h" diff --git a/pix_opencv_blobtrack-help.pd b/pix_opencv_blobtrack-help.pd index 8d0e2bf..17e551a 100644 --- a/pix_opencv_blobtrack-help.pd +++ b/pix_opencv_blobtrack-help.pd @@ -1,4 +1,4 @@ -#N canvas 937 403 818 513 10; +#N canvas 935 409 818 513 10; #X obj 7 200 cnv 15 430 300 empty empty empty 20 12 0 14 -233017 -66577 0; #X obj 7 156 cnv 15 430 40 empty empty empty 20 12 0 14 -195568 -66577 @@ -150,7 +150,7 @@ tracker and a trajectory post processor.; #X msg 147 194 setModule fg FG_1; #X text 98 342 monitoring stage :; #X obj 99 359 vradio 15 1 0 3 empty empty empty 0 -8 0 10 -262144 -1 --1 1; +-1 0; #X text 117 358 input image; #X text 116 374 foreground mask; #X text 116 389 diplsay blobs; diff --git a/pix_opencv_calibration.h b/pix_opencv_calibration.h index ea90a47..49bc6ac 100644 --- a/pix_opencv_calibration.h +++ b/pix_opencv_calibration.h @@ -17,7 +17,7 @@ LOG #define INCLUDE_pix_opencv_calibration_H_ #ifndef _EiC -#include "cv.h" +#include "opencv2/legacy/legacy.hpp" #endif #include "Base/GemPixObj.h" diff --git a/pix_opencv_camshift.h b/pix_opencv_camshift.h index 58debb9..7b127c8 100644 --- a/pix_opencv_camshift.h +++ b/pix_opencv_camshift.h @@ -17,7 +17,8 @@ LOG #define INCLUDE_PIX_OPENCV_CAMSHIFT_H_ #ifndef _EiC -#include "cv.h" +#include "opencv2/legacy/legacy.hpp" +#include "opencv2/video/tracking.hpp" #endif #include "Base/GemPixObj.h" diff --git a/pix_opencv_colorfilt.h b/pix_opencv_colorfilt.h index 8a92af6..20b4996 100644 --- a/pix_opencv_colorfilt.h +++ b/pix_opencv_colorfilt.h @@ -19,7 +19,7 @@ LOG #include #ifndef _EiC -#include "cv.h" +#include "opencv2/legacy/legacy.hpp" #endif #include "Base/GemPixObj.h" diff --git a/pix_opencv_contours.h b/pix_opencv_contours.h index e861642..bb2fff7 100644 --- a/pix_opencv_contours.h +++ b/pix_opencv_contours.h @@ -15,7 +15,7 @@ LOG #define INCLUDE_PIX_OPENCV_CONTOURS_H_ #ifndef _EiC -#include "cv.h" +#include "opencv2/legacy/legacy.hpp" #endif #include "Base/GemPixObj.h" diff --git a/pix_opencv_contours_boundingrect.h b/pix_opencv_contours_boundingrect.h index e599f69..e8634ff 100644 --- a/pix_opencv_contours_boundingrect.h +++ b/pix_opencv_contours_boundingrect.h @@ -17,7 +17,8 @@ LOG #define INCLUDE_PIX_OPENCV_CONTOURS_BOUNDINGRECT_H_ #ifndef _EiC -#include "cv.h" +#include "opencv2/legacy/legacy.hpp" +#include "opencv2/legacy/compat.hpp" #endif #include "Base/GemPixObj.h" diff --git a/pix_opencv_contours_convexhull.h b/pix_opencv_contours_convexhull.h index 70d9a61..0162b71 100644 --- a/pix_opencv_contours_convexhull.h +++ b/pix_opencv_contours_convexhull.h @@ -17,7 +17,8 @@ LOG #define INCLUDE_PIX_OPENCV_CONTOURS_CONVEXITY_H_ #ifndef _EiC -#include "cv.h" +#include "opencv2/legacy/legacy.hpp" +#include "opencv2/legacy/compat.hpp" #endif #include "Base/GemPixObj.h" diff --git a/pix_opencv_contours_convexity.h b/pix_opencv_contours_convexity.h index 37939e0..d03e723 100644 --- a/pix_opencv_contours_convexity.h +++ b/pix_opencv_contours_convexity.h @@ -17,7 +17,8 @@ LOG #define INCLUDE_PIX_OPENCV_CONTOURS_CONVEXITY_H_ #ifndef _EiC -#include "cv.h" +#include "opencv2/legacy/legacy.hpp" +#include "opencv2/legacy/compat.hpp" #endif #include "Base/GemPixObj.h" diff --git a/pix_opencv_dft.h b/pix_opencv_dft.h index d309660..26f1b1e 100644 --- a/pix_opencv_dft.h +++ b/pix_opencv_dft.h @@ -17,7 +17,7 @@ LOG #define INCLUDE_PIX_OPENCV_DFT_H_ #ifndef _EiC -#include "cv.h" +#include "opencv2/legacy/legacy.hpp" #endif #include "Base/GemPixObj.h" diff --git a/pix_opencv_distrans.h b/pix_opencv_distrans.h index 9e16c86..c697aee 100644 --- a/pix_opencv_distrans.h +++ b/pix_opencv_distrans.h @@ -17,7 +17,7 @@ LOG #define INCLUDE_PIX_OPENCV_DISTRANS_H_ #ifndef _EiC -#include "cv.h" +#include "opencv2/legacy/legacy.hpp" #endif #include "Base/GemPixObj.h" diff --git a/pix_opencv_edge.h b/pix_opencv_edge.h index 344b629..5a06ff2 100644 --- a/pix_opencv_edge.h +++ b/pix_opencv_edge.h @@ -17,7 +17,7 @@ LOG #define INCLUDE_PIX_OPENCV_EDGE_H_ #ifndef _EiC -#include "cv.h" +#include "opencv2/legacy/legacy.hpp" #endif #include "Base/GemPixObj.h" diff --git a/pix_opencv_findchessboardcorners.h b/pix_opencv_findchessboardcorners.h index 08dc91d..1dba447 100644 --- a/pix_opencv_findchessboardcorners.h +++ b/pix_opencv_findchessboardcorners.h @@ -18,7 +18,7 @@ LOG #define INCLUDE_PIX_OPENCV_FINDCHESSBOARDCORNERS_H_ #ifndef _EiC -#include "cv.h" +#include "opencv2/legacy/legacy.hpp" #endif #include "Base/GemPixObj.h" diff --git a/pix_opencv_floodfill.h b/pix_opencv_floodfill.h index 2313059..9653666 100644 --- a/pix_opencv_floodfill.h +++ b/pix_opencv_floodfill.h @@ -17,7 +17,7 @@ LOG #define INCLUDE_PIX_OPENCV_FLOODFILL_H_ #ifndef _EiC -#include "cv.h" +#include "opencv2/legacy/legacy.hpp" #endif #include "Base/GemPixObj.h" diff --git a/pix_opencv_haarcascade.h b/pix_opencv_haarcascade.h index 94ebc44..6c9c5de 100644 --- a/pix_opencv_haarcascade.h +++ b/pix_opencv_haarcascade.h @@ -17,7 +17,8 @@ LOG #define INCLUDE_PIX_OPENCV_HAARSCASCADE_H_ #ifndef _EiC -#include "cv.h" +#include "opencv2/legacy/legacy.hpp" +#include "opencv2/objdetect/objdetect.hpp" #endif #include "Base/GemPixObj.h" diff --git a/pix_opencv_hist_compare.h b/pix_opencv_hist_compare.h index fd1bb29..9dc24fd 100644 --- a/pix_opencv_hist_compare.h +++ b/pix_opencv_hist_compare.h @@ -17,7 +17,8 @@ LOG #define INCLUDE_PIX_OPENCV_HIST_COMPARE_H_ #ifndef _EiC -#include "cv.h" +#include "opencv2/legacy/legacy.hpp" +#include "opencv2/legacy/compat.hpp" #endif #include "Base/GemPixObj.h" diff --git a/pix_opencv_hough_circles.h b/pix_opencv_hough_circles.h index cf2ee26..a378872 100644 --- a/pix_opencv_hough_circles.h +++ b/pix_opencv_hough_circles.h @@ -17,7 +17,7 @@ LOG #define INCLUDE_PIX_OPENCV_HOUGH_CIRCLES_H_ #ifndef _EiC -#include "cv.h" +#include "opencv2/legacy/legacy.hpp" #endif #include "Base/GemPixObj.h" diff --git a/pix_opencv_hough_lines.h b/pix_opencv_hough_lines.h index aa30533..6f277da 100644 --- a/pix_opencv_hough_lines.h +++ b/pix_opencv_hough_lines.h @@ -17,7 +17,7 @@ LOG #define INCLUDE_PIX_OPENCV_HOUGH_LINES_H_ #ifndef _EiC -#include "cv.h" +#include "opencv2/legacy/legacy.hpp" #endif #include "Base/GemPixObj.h" diff --git a/pix_opencv_hu_compare.h b/pix_opencv_hu_compare.h index ad098b5..fbe1c12 100644 --- a/pix_opencv_hu_compare.h +++ b/pix_opencv_hu_compare.h @@ -17,7 +17,8 @@ LOG #define INCLUDE_PIX_OPENCV_HU_COMPARE_H_ #ifndef _EiC -#include "cv.h" +#include "opencv2/legacy/legacy.hpp" +#include "opencv2/legacy/compat.hpp" #endif #include "Base/GemPixDualObj.h" diff --git a/pix_opencv_hu_moments.h b/pix_opencv_hu_moments.h index 8b60781..d7b2d48 100644 --- a/pix_opencv_hu_moments.h +++ b/pix_opencv_hu_moments.h @@ -17,7 +17,7 @@ LOG #define INCLUDE_PIX_OPENCV_HU_MOMENTS_H_ #ifndef _EiC -#include "cv.h" +#include "opencv2/legacy/legacy.hpp" #endif #include "Base/GemPixObj.h" diff --git a/pix_opencv_knear.h b/pix_opencv_knear.h index 37537a5..f19a477 100644 --- a/pix_opencv_knear.h +++ b/pix_opencv_knear.h @@ -17,9 +17,9 @@ LOG #define INCLUDE_PIX_OPENCV_KNEAR_H_ #ifndef _EiC -#include "cv.h" -#include "highgui.h" -#include "ml.h" +#include "opencv2/legacy/legacy.hpp" +#include "opencv2/highgui/highgui_c.h" +#include "opencv2/ml/ml.hpp" #endif #include "Base/GemPixObj.h" diff --git a/pix_opencv_laplace.h b/pix_opencv_laplace.h index c1aff98..948c425 100644 --- a/pix_opencv_laplace.h +++ b/pix_opencv_laplace.h @@ -17,7 +17,8 @@ LOG #define INCLUDE_PIX_OPENCV_LAPLACE_H_ #ifndef _EiC -#include "cv.h" +#include "opencv2/legacy/legacy.hpp" +#include "opencv2/legacy/compat.hpp" #endif #include "Base/GemPixObj.h" diff --git a/pix_opencv_lk.h b/pix_opencv_lk.h index 3e19852..aa560b3 100644 --- a/pix_opencv_lk.h +++ b/pix_opencv_lk.h @@ -17,8 +17,8 @@ LOG #define INCLUDE_PIX_OPENCV_LK_H_ #ifndef _EiC -#include "cv.h" #include "opencv2/legacy/legacy.hpp" +#include "opencv2/video/tracking.hpp" #endif #include "Base/GemPixObj.h" diff --git a/pix_opencv_matchshape.h b/pix_opencv_matchshape.h index 9fc971b..1bd5674 100644 --- a/pix_opencv_matchshape.h +++ b/pix_opencv_matchshape.h @@ -17,7 +17,7 @@ LOG #define INCLUDE_PIX_OPENCV_MATCHSHAPE_H_ #ifndef _EiC -#include "cv.h" +#include "opencv2/legacy/legacy.hpp" #endif #include "Base/GemPixObj.h" diff --git a/pix_opencv_morphology.h b/pix_opencv_morphology.h index 90c0780..a8e78c4 100644 --- a/pix_opencv_morphology.h +++ b/pix_opencv_morphology.h @@ -17,7 +17,7 @@ LOG #define INCLUDE_PIX_OPENCV_MORPHOLOGY_H_ #ifndef _EiC -#include "cv.h" +#include "opencv2/legacy/legacy.hpp" #endif #include "Base/GemPixObj.h" diff --git a/pix_opencv_motempl.h b/pix_opencv_motempl.h index 7fc6aa7..187cd22 100644 --- a/pix_opencv_motempl.h +++ b/pix_opencv_motempl.h @@ -17,7 +17,10 @@ LOG #define INCLUDE_PIX_OPENCV_MOTEMPL_H_ #ifndef _EiC -#include "cv.h" +#include "opencv2/legacy/legacy.hpp" +#include "opencv2/legacy/compat.hpp" +#include "opencv2/video/tracking.hpp" + #include #include #include diff --git a/pix_opencv_of_bm.h b/pix_opencv_of_bm.h index 8b3f446..ab62004 100644 --- a/pix_opencv_of_bm.h +++ b/pix_opencv_of_bm.h @@ -17,8 +17,8 @@ LOG #define INCLUDE_PIX_OPENCV_OF_BM_H_ #ifndef _EiC -#include "cv.h" #include "opencv2/legacy/legacy.hpp" +#include "opencv2/video/tracking.hpp" #endif #include "Base/GemPixObj.h" diff --git a/pix_opencv_of_hs.h b/pix_opencv_of_hs.h index 43470cd..56bb747 100644 --- a/pix_opencv_of_hs.h +++ b/pix_opencv_of_hs.h @@ -17,8 +17,8 @@ LOG #define INCLUDE_PIX_OPENCV_OF_HS_H_ #ifndef _EiC -#include "cv.h" #include "opencv2/legacy/legacy.hpp" +#include "opencv2/video/tracking.hpp" #endif #include "Base/GemPixObj.h" diff --git a/pix_opencv_of_lk.h b/pix_opencv_of_lk.h index 7745505..a8ef39d 100644 --- a/pix_opencv_of_lk.h +++ b/pix_opencv_of_lk.h @@ -17,8 +17,8 @@ LOG #define INCLUDE_PIX_OPENCV_OF_LK_H_ #ifndef _EiC -#include "cv.h" #include "opencv2/legacy/legacy.hpp" +#include "opencv2/video/tracking.hpp" #endif #include "Base/GemPixObj.h" diff --git a/pix_opencv_pgh_compare.h b/pix_opencv_pgh_compare.h index 535cb29..435570e 100644 --- a/pix_opencv_pgh_compare.h +++ b/pix_opencv_pgh_compare.h @@ -17,8 +17,8 @@ LOG #define INCLUDE_PIX_OPENCV_PGH_COMPARE_H_ #ifndef _EiC -#include "cv.h" -#include "cvaux.h" +#include "opencv2/legacy/legacy.hpp" +#include "opencv2/legacy/compat.hpp" #endif #include "Base/GemPixDualObj.h" diff --git a/pix_opencv_surf.h b/pix_opencv_surf.h index 7c819c3..996fed4 100644 --- a/pix_opencv_surf.h +++ b/pix_opencv_surf.h @@ -17,7 +17,7 @@ LOG #define INCLUDE_PIX_OPENCV_SURF_H_ #ifndef _EiC -#include "cv.h" +#include "opencv2/legacy/legacy.hpp" #endif #include "Base/GemPixObj.h" diff --git a/pix_opencv_threshold.h b/pix_opencv_threshold.h index d061d1e..33b4594 100644 --- a/pix_opencv_threshold.h +++ b/pix_opencv_threshold.h @@ -17,7 +17,7 @@ LOG #define INCLUDE_PIX_OPENCV_THRESHOLD_H_ #ifndef _EiC -#include "cv.h" +#include "opencv2/legacy/legacy.hpp" #endif #include "Base/GemPixObj.h" diff --git a/pix_opencv_warpperspective.h b/pix_opencv_warpperspective.h index 22fca5f..549695d 100644 --- a/pix_opencv_warpperspective.h +++ b/pix_opencv_warpperspective.h @@ -18,7 +18,7 @@ LOG #define INCLUDE_PIX_OPENCV_WARPPERSPECTIVE_H_ #ifndef _EiC -#include "cv.hpp" +#include "opencv2/opencv.hpp" #endif #include "Base/GemPixObj.h" -- cgit v1.2.1