From 34d685b8cbfa441374f7ceb3612c08f4fd831172 Mon Sep 17 00:00:00 2001 From: Antoine Villeret Date: Thu, 20 Jun 2013 12:34:19 +0000 Subject: revert last changes not ready to forget opencv 1.5 dependency right now... svn path=/trunk/externals/pix_opencv/; revision=17154 --- pix_opencv_lk.h | 2 +- pix_opencv_of_bm.h | 2 +- pix_opencv_of_hs.h | 2 +- pix_opencv_of_lk.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pix_opencv_lk.h b/pix_opencv_lk.h index 2e3f640..cae97a7 100644 --- a/pix_opencv_lk.h +++ b/pix_opencv_lk.h @@ -17,7 +17,7 @@ LOG #define INCLUDE_PIX_OPENCV_LK_H_ #ifndef _EiC -#include "opencv2/legacy/legacy.hpp" +#include "cv.h" #endif #include "Base/GemPixObj.h" diff --git a/pix_opencv_of_bm.h b/pix_opencv_of_bm.h index 20a1ce4..f5c75f0 100644 --- a/pix_opencv_of_bm.h +++ b/pix_opencv_of_bm.h @@ -17,7 +17,7 @@ LOG #define INCLUDE_PIX_OPENCV_OF_BM_H_ #ifndef _EiC -#include "opencv2/legacy/legacy.hpp" +#include "cv.h" #endif #include "Base/GemPixObj.h" diff --git a/pix_opencv_of_hs.h b/pix_opencv_of_hs.h index ba836b8..b51cc67 100644 --- a/pix_opencv_of_hs.h +++ b/pix_opencv_of_hs.h @@ -17,7 +17,7 @@ LOG #define INCLUDE_PIX_OPENCV_OF_HS_H_ #ifndef _EiC -#include "opencv2/legacy/legacy.hpp" +#include "cv.h" #endif #include "Base/GemPixObj.h" diff --git a/pix_opencv_of_lk.h b/pix_opencv_of_lk.h index 212b98f..fb23b78 100644 --- a/pix_opencv_of_lk.h +++ b/pix_opencv_of_lk.h @@ -17,7 +17,7 @@ LOG #define INCLUDE_PIX_OPENCV_OF_LK_H_ #ifndef _EiC -#include "opencv2/legacy/legacy.hpp" +#include "cv.h" #endif #include "Base/GemPixObj.h" -- cgit v1.2.1