Make highgui.hpp independent from C API

2013-04-07 22:45:38 +04:00
parent 288a0634c2
commit 0738ea7d0f
152 changed files with 899 additions and 594 deletions
--- a/modules/python/src2/cv2.cpp
+++ b/modules/python/src2/cv2.cpp
@@ -23,6 +23,8 @@
 #include "opencv2/photo.hpp"
 #include "opencv2/highgui.hpp"

+#include "opencv2/highgui/highgui_c.h"
+
 #include "opencv2/opencv_modules.hpp"

 #ifdef HAVE_OPENCV_NONFREE
--- a/modules/python/src2/cv2.cv.hpp
+++ b/modules/python/src2/cv2.cv.hpp
@@ -1,5 +1,6 @@
 #include "opencv2/legacy.hpp"
 #include "opencv2/legacy/compat.hpp"
+#include "opencv2/highgui/highgui_c.h"

 #define OLD_MODULESTR "cv2.cv"

--- a/modules/python/src2/gen2.py
+++ b/modules/python/src2/gen2.py
@@ -211,6 +211,7 @@ gen_template_rw_prop_init = Template("""

 simple_argtype_mapping = {
    "bool": ("bool", "b", "0"),
+    "char": ("char", "b", "0"),
    "int": ("int", "i", "0"),
    "float": ("float", "f", "0.f"),
    "double": ("double", "d", "0"),