Merge pull request opencv#9265 from alalek:python_stitching

alalek · alalek · commit 65519ab78679 · 2017-07-31T12:02:18.000Z
diff --git a/modules/python/src2/cv2.cpp b/modules/python/src2/cv2.cpp
@@ -149,7 +149,7 @@ class NumpyAllocator : public MatAllocator
     {
         if( data != 0 )
         {
-            CV_Error(Error::StsAssert, "The data should normally be NULL!");
+            // issue #6969: CV_Error(Error::StsAssert, "The data should normally be NULL!");
             // probably this is safe to do in such extreme case
             return stdAllocator->allocate(dims0, sizes, type, data, step, flags, usageFlags);
         }
diff --git a/modules/python/test/test_stitching.py b/modules/python/test/test_stitching.py
@@ -0,0 +1,20 @@
+#!/usr/bin/env python
+import cv2
+
+from tests_common import NewOpenCVTests
+
+class stitching_test(NewOpenCVTests):
+
+    def test_simple(self):
+
+        img1 = self.get_sample('stitching/a1.png')
+        img2 = self.get_sample('stitching/a2.png')
+
+        stitcher = cv2.createStitcher(False)
+        (result, pano) = stitcher.stitch((img1, img2))
+
+        #cv2.imshow("pano", pano)
+        #cv2.waitKey()
+
+        self.assertAlmostEqual(pano.shape[0], 685, delta=100, msg="rows: %r" % list(pano.shape))
+        self.assertAlmostEqual(pano.shape[1], 1025, delta=100, msg="cols: %r" % list(pano.shape))

Original file line number	Diff line number	Diff line change
`@@ -149,7 +149,7 @@ class NumpyAllocator : public MatAllocator`
`149`	`149`	`{`
`150`	`150`	`if( data != 0 )`
`151`	`151`	`{`
`152`		`- CV_Error(Error::StsAssert, "The data should normally be NULL!");`
	`152`	`+ // issue #6969: CV_Error(Error::StsAssert, "The data should normally be NULL!");`
`153`	`153`	`// probably this is safe to do in such extreme case`
`154`	`154`	`return stdAllocator->allocate(dims0, sizes, type, data, step, flags, usageFlags);`
`155`	`155`	`}`