Added CV_8UC.. CV_64FC

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

diff --git a/opencv/interfaces/python/api b/opencv/interfaces/python/api
index 1769a1041aa0ca0d63f5c3818b0ed2931ad42e05..d88031b4c05aec2318703415fbd0c120b863e04b 100644 (file)
--- a/opencv/interfaces/python/api
+++ b/opencv/interfaces/python/api
@@ -31,6 +31,20 @@ CV_FOURCC int
 CV_MAKETYPE int
   int depth
   int cn
+CV_8UC int
+  int n
+CV_8SC int
+  int n
+CV_16UC int
+  int n
+CV_16SC int
+  int n
+CV_32SC int
+  int n
+CV_32FC int
+  int n
+CV_64FC int
+  int n
 
 # Initialization
 CloneImage IplImage*

diff --git a/opencv/tests/python/test.py b/opencv/tests/python/test.py
index ca9a608904a168e384ea5bfac362262cb8c8d667..15c3a30ef0ec28a53321626ef76e7d9ad5812540 100644 (file)
--- a/opencv/tests/python/test.py
+++ b/opencv/tests/python/test.py
@@ -181,6 +181,17 @@ class TestDirected(unittest.TestCase):
     def test_types(self):
         self.assert_(type(cv.CreateImage((7,5), cv.IPL_DEPTH_8U, 1)) == cv.iplimage)
         self.assert_(type(cv.CreateMat(5, 7, cv.CV_32FC1)) == cv.cvmat)
+        for i,t in enumerate(self.mat_types):
+            basefunc = [
+                cv.CV_8UC,
+                cv.CV_8SC,
+                cv.CV_16UC,
+                cv.CV_16SC,
+                cv.CV_32SC,
+                cv.CV_32FC,
+                cv.CV_64FC,
+            ][i / 4]
+            self.assertEqual(basefunc(1 + (i % 4)), t)
 
     def test_GetSize(self):
         self.assert_(cv.GetSize(cv.CreateMat(5, 7, cv.CV_32FC1)) == (7,5))