From 0186bd80999e27080d69b5974d58217ddc6feffc Mon Sep 17 00:00:00 2001 From: Vadim Pisarevsky Date: Mon, 26 Mar 2012 13:32:32 +0000 Subject: [PATCH] split big assertion in cv::split by parts; patch #829 by Shlomi Fish --- modules/core/src/convert.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/modules/core/src/convert.cpp b/modules/core/src/convert.cpp index 4909847fba..26c3c55784 100644 --- a/modules/core/src/convert.cpp +++ b/modules/core/src/convert.cpp @@ -1190,9 +1190,10 @@ cvSplit( const void* srcarr, void* dstarr0, void* dstarr1, void* dstarr2, void* if( dptrs[i] != 0 ) { dvec[j] = cv::cvarrToMat(dptrs[i]); - CV_Assert( dvec[j].size() == src.size() && - dvec[j].depth() == src.depth() && - dvec[j].channels() == 1 && i < src.channels() ); + CV_Assert( dvec[j].size() == src.size() ); + CV_Assert( dvec[j].depth() == src.depth() ); + CV_Assert( dvec[j].channels() == 1 ); + CV_Assert( i < src.channels() ); pairs[j*2] = i; pairs[j*2+1] = j; j++;