aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntoine Villeret <avilleret@users.sourceforge.net>2013-06-20 21:32:20 +0000
committerAntoine Villeret <avilleret@users.sourceforge.net>2013-06-20 21:32:20 +0000
commit3141bbf7870bce1e3f93985cd55f0e156be3aec1 (patch)
treea29b356b9cd6af67a2d3830ac5a19d4b95856f4d
parentc8ddc4c0fcb1dfe5c831fda4f1dd26ddc072b65e (diff)
fix opencv 2.4.5 compatibility
svn path=/trunk/externals/pix_opencv/; revision=17157
-rw-r--r--pix_opencv_blobtrack.cc2
-rw-r--r--pix_opencv_blobtrack.h1
-rw-r--r--pix_opencv_lk.h1
-rw-r--r--pix_opencv_of_bm.h1
-rw-r--r--pix_opencv_of_hs.h1
-rw-r--r--pix_opencv_of_lk.h1
6 files changed, 6 insertions, 1 deletions
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 <stdio.h>
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 <opencv2/imgproc/imgproc_c.h>
#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"