[opencv] 189/251: python: disable assertion in NumpyAllocator

[Nobuhiro Iwamatsu]

This is an automated email from the git hooks/post-receive script.

iwamatsu pushed a commit to annotated tag 3.3.0
in repository opencv.

commit 46f05f2db6a829e7123f6d37e16d3f0f2b8cf706
Author: Alexander Alekhin <alexander.alekhin at intel.com>
Date:   Sun Jul 30 13:54:54 2017 +0300

    python: disable assertion in NumpyAllocator
---
 modules/python/src2/cv2.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/python/src2/cv2.cpp b/modules/python/src2/cv2.cpp
index e0609dd..be8965c 100644
--- a/modules/python/src2/cv2.cpp
+++ b/modules/python/src2/cv2.cpp
@@ -149,7 +149,7 @@ public:
     {
         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);
         }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/opencv.git