potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-21 19:33:03 +04:00
Code Packages Releases Wiki Activity

Completely separate C and C++ API of OpenCV core

Browse Source
This commit is contained in:
Andrey Kamaev
2013-03-29 12:59:55 +04:00
parent 715fa3303e
commit 2b1ef95415
46 changed files with 201 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/opencv/cv.h
-6
View File
@@ -61,8 +61,6 @@
//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.hpp"
#include "opencv2/core/utility.hpp"
#include "opencv2/imgproc/imgproc_c.h"
#include "opencv2/imgproc.hpp"
#include "opencv2/video.hpp"
@@ -76,9 +74,5 @@
#define CV_IMPL extern "C"
#endif //CV_IMPL
#if defined(__cplusplus)
#include "opencv2/core/internal.hpp"
#endif //__cplusplus
#endif // __OPENCV_OLD_CV_H_
include/opencv/cv.hpp
+2 -1
View File
@@ -47,6 +47,7 @@
//#warning "This is a deprecated opencv header provided for compatibility. Please include a header from a corresponding opencv module"
//#endif
#include <cv.h>
#include "cv.h"
#include "opencv2/core.hpp"
#endif
include/opencv/cvaux.h
-1
View File
@@ -47,7 +47,6 @@
//#endif
#include "opencv2/core/core_c.h"
#include "opencv2/core.hpp"
#include "opencv2/imgproc/imgproc_c.h"
#include "opencv2/imgproc.hpp"
#include "opencv2/video.hpp"
include/opencv/cvaux.hpp
+2 -1
View File
@@ -46,6 +46,7 @@
//#warning "This is a deprecated opencv header provided for compatibility. Please include a header from a corresponding opencv module"
//#endif
#include <cvaux.h>
#include "cvaux.h"
#include "opencv2/core/utility.hpp"
#endif
include/opencv/cxcore.h
-1
View File
@@ -48,6 +48,5 @@
//#endif
#include "opencv2/core/core_c.h"
#include "opencv2/core.hpp"
#endif
include/opencv/cxcore.hpp
+2 -1
View File
@@ -47,6 +47,7 @@
//#warning "This is a deprecated opencv header provided for compatibility. Please include a header from a corresponding opencv module"
//#endif
#include <cxcore.h>
#include "cxcore.h"
#include "opencv2/core.hpp"
#endif
include/opencv/highgui.h
-1
View File
@@ -43,7 +43,6 @@
#define __OPENCV_OLD_HIGHGUI_H__
#include "opencv2/core/core_c.h"
#include "opencv2/core.hpp"
#include "opencv2/highgui/highgui_c.h"
#include "opencv2/highgui.hpp"
include/opencv/ml.h
-1
View File
@@ -42,7 +42,6 @@
#define __OPENCV_OLD_ML_H__
#include "opencv2/core/core_c.h"
#include "opencv2/core.hpp"
#include "opencv2/ml.hpp"
#endif
include/opencv2/opencv.hpp
-3
View File
@@ -43,10 +43,8 @@
#ifndef __OPENCV_ALL_HPP__
#define __OPENCV_ALL_HPP__
#include "opencv2/core/core_c.h"
#include "opencv2/core.hpp"
#include "opencv2/flann/miniflann.hpp"
#include "opencv2/imgproc/imgproc_c.h"
#include "opencv2/imgproc.hpp"
#include "opencv2/photo.hpp"
#include "opencv2/video.hpp"
@@ -54,7 +52,6 @@
#include "opencv2/objdetect.hpp"
#include "opencv2/calib3d.hpp"
#include "opencv2/ml.hpp"
#include "opencv2/highgui/highgui_c.h"
#include "opencv2/highgui.hpp"
#include "opencv2/contrib.hpp"