Make imgproc.hpp independent from C API

2013-04-06 18:16:51 +04:00
parent 7ac0d86992
commit 288a0634c2
95 changed files with 1400 additions and 1300 deletions
--- a/include/opencv/cv.h
+++ b/include/opencv/cv.h
@@ -62,7 +62,6 @@

 #include "opencv2/core/core_c.h"
 #include "opencv2/imgproc/imgproc_c.h"
-#include "opencv2/imgproc.hpp"
 #include "opencv2/video.hpp"
 #include "opencv2/features2d.hpp"
 #include "opencv2/flann.hpp"
--- a/include/opencv/cv.hpp
+++ b/include/opencv/cv.hpp
@@ -49,5 +49,7 @@

 #include "cv.h"
 #include "opencv2/core.hpp"
+#include "opencv2/imgproc.hpp"
+#include "opencv2/highgui.hpp"

 #endif
--- a/include/opencv/cvaux.h
+++ b/include/opencv/cvaux.h
@@ -48,7 +48,6 @@

 #include "opencv2/core/core_c.h"
 #include "opencv2/imgproc/imgproc_c.h"
-#include "opencv2/imgproc.hpp"
 #include "opencv2/video.hpp"
 #include "opencv2/features2d.hpp"
 #include "opencv2/calib3d.hpp"
--- a/include/opencv/highgui.h
+++ b/include/opencv/highgui.h
@@ -44,6 +44,5 @@

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

 #endif