cvSplit-split-assert.diff

Partial patch to split one of the assertions (that tripped me in person). - shlomifrsip -, 2012-01-26 01:15 pm

Download (775 Bytes)

 
modules/core/src/convert.cpp (working copy)
1152 1152 
        if( dptrs[i] != 0 )
1153 1153 
        {
1154 1154 
            dvec[j] = cv::cvarrToMat(dptrs[i]);
1155 
            CV_Assert( dvec[j].size() == src.size() &&
1156 
                dvec[j].depth() == src.depth() &&
1157 
                dvec[j].channels() == 1 && i < src.channels() );
1155 
            CV_Assert( dvec[j].size() == src.size() );
1156 
            CV_Assert( dvec[j].depth() == src.depth() );
1157 
            CV_Assert( dvec[j].channels() == 1 );
1158 
            CV_Assert( i < src.channels() );
1158 1159 
            pairs[j*2] = i;
1159 1160 
            pairs[j*2+1] = j;
1160 1161 
            j++;