split big assertion in cv::split by parts; patch #829 by Shlomi Fish

0186bd80 · Vadim Pisarevsky · 54a4ff03 · 0186bd80
Commit 0186bd80 authored Mar 26, 2012 by Vadim Pisarevsky
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 3 deletions

convert.cpp modules/core/src/convert.cpp +4 -3

No files found.
--- 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++;