generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Vadim Pisarevsky 2012-03-26 13:32:32 +00:00
parent 54a4ff033a
commit 0186bd8099
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
modules/core/src/convert.cpp
View File

@ -1190,9 +1190,10 @@ cvSplit( const void* srcarr, void* dstarr0, void* dstarr1, void* dstarr2, void*
if( dptrs[i] != 0 ) if( dptrs[i] != 0 )
{ {
dvec[j] = cv::cvarrToMat(dptrs[i]); dvec[j] = cv::cvarrToMat(dptrs[i]);
CV_Assert( dvec[j].size() == src.size() && CV_Assert( dvec[j].size() == src.size() );
dvec[j].depth() == src.depth() && CV_Assert( dvec[j].depth() == src.depth() );
dvec[j].channels() == 1 && i < src.channels() ); CV_Assert( dvec[j].channels() == 1 );
CV_Assert( i < src.channels() );
pairs[j*2] = i; pairs[j*2] = i;
pairs[j*2+1] = j; pairs[j*2+1] = j;
j++; j++;