python: disable assertion in NumpyAllocator

alalek · alalek · commit 46f05f2db6a8 · 2017-07-30T14:44:11.000+03:00
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);
         }

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`	`}`