numpy test fromarray(allowND) check

[opencv.git] / opencv / tests / python / test.py

diff --git a/opencv/tests/python/test.py b/opencv/tests/python/test.py
index a29a680915dff4e8a68a632d332476de7db3ff79..6f2806e2b69ccedd74b3b4662267fd74c1f995bf 100644 (file)
--- a/opencv/tests/python/test.py
+++ b/opencv/tests/python/test.py
@@ -753,7 +753,8 @@ class AreaTests(OpenCVTests):
                 a1 = numpy.array([1] * reduce(operator.__mul__, numpydims)).reshape(*numpydims)
                 return cv.fromarray(a1)
             def row_col_chan(m):
-                (col, row) = cv.GetSize(m)
+                col = m.cols
+                row = m.rows
                 chan = cv.CV_MAT_CN(cv.GetElemType(m))
                 return (row, col, chan)
 
@@ -804,7 +805,7 @@ class AreaTests(OpenCVTests):
             # multi-dimensional NumPy array
             na = numpy.ones([7,9,2,1,8])
             cm = cv.fromarray(na, True)
-            print cv.GetDims(cm)
+            self.assertEqual(cv.GetDims(cm), (7,9,2,1,8))
 
             # Using an array object for a CvArr parameter
             ones = numpy.ones((640, 480))
@@ -1646,7 +1647,7 @@ class AreaTests(OpenCVTests):
         # All results should be same
         self.assertEqual(len(hashes), 1)
 
-        self.snap(dst)
+        # self.snap(dst)
         shapes = [eval("cv.CV_SHAPE_%s" % s) for s in ['RECT', 'CROSS', 'ELLIPSE']]
         elements = [cv.CreateStructuringElementEx(sz, sz, sz / 2 + 1, sz / 2 + 1, shape) for sz in [3, 4, 7, 20] for shape in shapes]
         elements += [cv.CreateStructuringElementEx(7, 7, 3, 3, cv.CV_SHAPE_CUSTOM, [1] * 49)]
@@ -1699,7 +1700,7 @@ class AreaTests(OpenCVTests):
         a = self.get_sample("samples/c/lena.jpg", 0)
         eig_image = cv.CreateImage(cv.GetSize(a), cv.IPL_DEPTH_32F, 1)
         temp_image = cv.CreateImage(cv.GetSize(a), cv.IPL_DEPTH_32F, 1)
-        pts = cv.GoodFeaturesToTrack(a, eig_image, temp_image, 100, 0.04, 2, use_harris=1)
+        pts = cv.GoodFeaturesToTrack(a, eig_image, temp_image, 100, 0.04, 2, useHarris=1)
         hull = cv.ConvexHull2(pts, cv.CreateMemStorage(), return_points = 1)
         cv.FitLine(hull, cv.CV_DIST_L2, 0, 0.01, 0.01)