generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Main module headers are moved 1 level up

Browse Source 
e.g. <opencv2/core/core.hpp> become <opencv2/core.hpp>

Also renamed <opencv2/core/opengl_interop.hpp> to <opencv2/core/opengl.hpp>
This commit is contained in:
Andrey Kamaev
2013-03-13 16:22:44 +04:00
parent 061dd7e84e
commit ad5cddc007
266 changed files with 571 additions and 588 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
include/opencv/cv.h
View File

@@ -61,14 +61,14 @@
//CV_WARNING("This is a deprecated opencv header provided for compatibility. Please include a header from a corresponding opencv module")
#include "opencv2/core/core_c.h"
#include "opencv2/core/core.hpp"
#include "opencv2/core.hpp"
#include "opencv2/imgproc/imgproc_c.h"
#include "opencv2/imgproc/imgproc.hpp"
#include "opencv2/video/tracking.hpp"
#include "opencv2/features2d/features2d.hpp"
#include "opencv2/flann/flann.hpp"
#include "opencv2/calib3d/calib3d.hpp"
#include "opencv2/objdetect/objdetect.hpp"
#include "opencv2/imgproc.hpp"
#include "opencv2/video.hpp"
#include "opencv2/features2d.hpp"
#include "opencv2/flann.hpp"
#include "opencv2/calib3d.hpp"
#include "opencv2/objdetect.hpp"
#include "opencv2/legacy/compat.hpp"
#if !defined(CV_IMPL)

17
include/opencv/cvaux.h
View File

@@ -47,18 +47,17 @@
//#endif
#include "opencv2/core/core_c.h"
#include "opencv2/core/core.hpp"
#include "opencv2/core.hpp"
#include "opencv2/imgproc/imgproc_c.h"
#include "opencv2/imgproc/imgproc.hpp"
#include "opencv2/video/tracking.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/imgproc.hpp"
#include "opencv2/video.hpp"
#include "opencv2/features2d.hpp"
#include "opencv2/calib3d.hpp"
#include "opencv2/objdetect.hpp"
#include "opencv2/legacy.hpp"
#include "opencv2/legacy/compat.hpp"
#include "opencv2/legacy/blobtrack.hpp"
#include "opencv2/contrib/contrib.hpp"
#include "opencv2/contrib.hpp"
#endif

2
include/opencv/cxcore.h
View File

@@ -48,6 +48,6 @@
//#endif
#include "opencv2/core/core_c.h"
#include "opencv2/core/core.hpp"
#include "opencv2/core.hpp"
#endif

4
include/opencv/highgui.h
View File

@@ -43,8 +43,8 @@
#define __OPENCV_OLD_HIGHGUI_H__
#include "opencv2/core/core_c.h"
#include "opencv2/core/core.hpp"
#include "opencv2/core.hpp"
#include "opencv2/highgui/highgui_c.h"
#include "opencv2/highgui/highgui.hpp"
#include "opencv2/highgui.hpp"
#endif

4
include/opencv/ml.h
View File

@@ -42,7 +42,7 @@
#define __OPENCV_OLD_ML_H__
#include "opencv2/core/core_c.h"
#include "opencv2/core/core.hpp"
#include "opencv2/ml/ml.hpp"
#include "opencv2/core.hpp"
#include "opencv2/ml.hpp"
#endif