From 1618ed0a3727d62c7b5fc488051a2b43902de80b Mon Sep 17 00:00:00 2001 From: Vadim Pisarevsky Date: Fri, 26 Nov 2010 18:01:16 +0000 Subject: [PATCH] update the old and the new-style headers after moving some old stuff to the legacy --- include/opencv/cv.h | 1 + include/opencv/cvaux.h | 3 ++- include/opencv2/opencv.hpp | 1 - 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/include/opencv/cv.h b/include/opencv/cv.h index 0cd9dd2..522e55d 100644 --- a/include/opencv/cv.h +++ b/include/opencv/cv.h @@ -69,6 +69,7 @@ #include "opencv2/flann/flann.hpp" #include "opencv2/calib3d/calib3d.hpp" #include "opencv2/objdetect/objdetect.hpp" +#include "opencv2/legacy/compat.hpp" #if !defined(CV_IMPL) #define CV_IMPL extern "C" diff --git a/include/opencv/cvaux.h b/include/opencv/cvaux.h index 04dcb81..b15d068 100644 --- a/include/opencv/cvaux.h +++ b/include/opencv/cvaux.h @@ -51,12 +51,13 @@ #include "opencv2/imgproc/imgproc_c.h" #include "opencv2/imgproc/imgproc.hpp" #include "opencv2/video/tracking.hpp" -#include "opencv2/video/blobtrack.hpp" #include "opencv2/video/background_segm.hpp" #include "opencv2/features2d/features2d.hpp" #include "opencv2/calib3d/calib3d.hpp" #include "opencv2/objdetect/objdetect.hpp" #include "opencv2/legacy/legacy.hpp" +#include "opencv2/legacy/compat.hpp" +#include "opencv2/legacy/blobtrack.hpp" #include "opencv2/contrib/contrib.hpp" #endif diff --git a/include/opencv2/opencv.hpp b/include/opencv2/opencv.hpp index 5d6b52d..3c2f414 100644 --- a/include/opencv2/opencv.hpp +++ b/include/opencv2/opencv.hpp @@ -58,7 +58,6 @@ #include "opencv2/ml/ml.hpp" #include "opencv2/highgui/highgui_c.h" #include "opencv2/highgui/highgui.hpp" -#include "opencv2/legacy/legacy.hpp" #include "opencv2/contrib/contrib.hpp" #endif -- 2.7.4