Completely separate C and C++ API of OpenCV core

2013-03-29 12:59:55 +04:00
parent 715fa3303e
commit 2b1ef95415
46 changed files with 201 additions and 183 deletions
--- a/modules/highgui/include/opencv2/highgui.hpp
+++ b/modules/highgui/include/opencv2/highgui.hpp
@@ -43,10 +43,10 @@
 #ifndef __OPENCV_HIGHGUI_HPP__
 #define __OPENCV_HIGHGUI_HPP__

-#include "opencv2/core.hpp"
 #include "opencv2/highgui/highgui_c.h"

 #ifdef __cplusplus
+#include "opencv2/core.hpp"

 struct CvCapture;
 struct CvVideoWriter;