From 3141bbf7870bce1e3f93985cd55f0e156be3aec1 Mon Sep 17 00:00:00 2001 From: Antoine Villeret Date: Thu, 20 Jun 2013 21:32:20 +0000 Subject: fix opencv 2.4.5 compatibility svn path=/trunk/externals/pix_opencv/; revision=17157 --- pix_opencv_blobtrack.cc | 2 +- pix_opencv_blobtrack.h | 1 + pix_opencv_lk.h | 1 + pix_opencv_of_bm.h | 1 + pix_opencv_of_hs.h | 1 + pix_opencv_of_lk.h | 1 + 6 files changed, 6 insertions(+), 1 deletion(-) diff --git a/pix_opencv_blobtrack.cc b/pix_opencv_blobtrack.cc index df6ec6f..ed84d20 100644 --- a/pix_opencv_blobtrack.cc +++ b/pix_opencv_blobtrack.cc @@ -15,7 +15,7 @@ // ///////////////////////////////////////////////////////// // based on code written by Lluis Gomez i Bigorda ( lluisgomez _at_ hangar _dot_ org ) (pix_opencv) -// mainly copy and paste from blobtracker_sample.cpp provided by OpenCV 2.3 SVN rev7875 +// mainly copy and paste from blobtrack_sample.cpp provided by OpenCV 2.3 SVN rev7875 #include "pix_opencv_blobtrack.h" #include diff --git a/pix_opencv_blobtrack.h b/pix_opencv_blobtrack.h index 66c9d4f..d1041be 100644 --- a/pix_opencv_blobtrack.h +++ b/pix_opencv_blobtrack.h @@ -19,6 +19,7 @@ LOG #ifndef _EiC #include "opencv2/video/background_segm.hpp" #include "opencv2/legacy/blobtrack.hpp" +#include "opencv2/legacy/legacy.hpp" #include "opencv2/highgui/highgui.hpp" #include #endif diff --git a/pix_opencv_lk.h b/pix_opencv_lk.h index cae97a7..3e19852 100644 --- a/pix_opencv_lk.h +++ b/pix_opencv_lk.h @@ -18,6 +18,7 @@ LOG #ifndef _EiC #include "cv.h" +#include "opencv2/legacy/legacy.hpp" #endif #include "Base/GemPixObj.h" diff --git a/pix_opencv_of_bm.h b/pix_opencv_of_bm.h index f5c75f0..8b3f446 100644 --- a/pix_opencv_of_bm.h +++ b/pix_opencv_of_bm.h @@ -18,6 +18,7 @@ LOG #ifndef _EiC #include "cv.h" +#include "opencv2/legacy/legacy.hpp" #endif #include "Base/GemPixObj.h" diff --git a/pix_opencv_of_hs.h b/pix_opencv_of_hs.h index b51cc67..43470cd 100644 --- a/pix_opencv_of_hs.h +++ b/pix_opencv_of_hs.h @@ -18,6 +18,7 @@ LOG #ifndef _EiC #include "cv.h" +#include "opencv2/legacy/legacy.hpp" #endif #include "Base/GemPixObj.h" diff --git a/pix_opencv_of_lk.h b/pix_opencv_of_lk.h index fb23b78..7745505 100644 --- a/pix_opencv_of_lk.h +++ b/pix_opencv_of_lk.h @@ -18,6 +18,7 @@ LOG #ifndef _EiC #include "cv.h" +#include "opencv2/legacy/legacy.hpp" #endif #include "Base/GemPixObj.h" -- cgit v1.2.1