Add CV_CN_SHIFT and CV_MAKETYPE

git-svn-id: https://code.ros.org/svn/opencv/trunk@2214 73c94f0f-984f-4a5f-82bc-2d8db8d8ee08

diff --git a/opencv/interfaces/python/api b/opencv/interfaces/python/api
index 2dbc3a32c62f2d714061fba5d3f25b23dc69b38e..38409eb4cde12627344f4ddb3ae0007e2d1ec2ac 100644 (file)
--- a/opencv/interfaces/python/api
+++ b/opencv/interfaces/python/api
@@ -28,6 +28,9 @@ CV_FOURCC int
   char c2
   char c3
   char c4
+CV_MAKETYPE int
+  int depth
+  int cn
 
 # Initialization
 CloneImage IplImage*

diff --git a/opencv/interfaces/python/defs b/opencv/interfaces/python/defs
index 5a81e9c02bcc1c78d513aaa53d9ee8ab43a6e1a9..7ce704d99c1364affed5e607eb5cbd39f6a58723 100644 (file)
--- a/opencv/interfaces/python/defs
+++ b/opencv/interfaces/python/defs
@@ -324,3 +324,4 @@ include/highgui.h:#define CV_CAP_PROP_EXPOSURE      15
 include/highgui.h:#define CV_CAP_PROP_CONVERT_RGB   16
 include/highgui.h:#define CV_CAP_PROP_WHITE_BALANCE 17
 include/highgui.h:#define CV_CAP_PROP_RECTIFICATION 18
+#define CV_CN_SHIFT   3