From d652cc72f2ab09f5fbe1066ee2d0f1e5bdc568af Mon Sep 17 00:00:00 2001
From: Vadim Pisarevsky <vadim.pisarevsky@itseez.com>
Date: Thu, 18 Oct 2012 15:29:03 +0400
Subject: [PATCH] fixed bugs #2100 (kind of) and #1393

[edit: cleaned whitespace]
---
 modules/python/src2/cv2.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/modules/python/src2/cv2.cpp b/modules/python/src2/cv2.cpp
index d16b01d1e..df909d7fe 100644
--- a/modules/python/src2/cv2.cpp
+++ b/modules/python/src2/cv2.cpp
@@ -279,11 +279,14 @@ static int pyopencv_to(const PyObject* o, Mat& m, const ArgInfo info, bool allow
             needcopy = true;
     }
 
+    if( ismultichannel && _strides[1] != (npy_intp)elemsize*_sizes[2] )
+        needcopy = true;
+
     if (needcopy)
     {
         if (info.outputarg)
         {
-            failmsg("output array %s is not row-contiguous (step[ndims-1] != elemsize)", info.name);
+            failmsg("Layout of the output array %s is compatible with cv::Mat (step[ndims-1] != elemsize or step[1] != elemsize*nchannels)", info.name);
             return false;
         }
         if( needcast )