Merge pull request #3093 from asmorkalov:ocv_array_bound_fix

This commit is contained in:
Vadim Pisarevsky 2014-08-13 14:08:50 +00:00
commit 988555a5d9

View File

@ -470,6 +470,12 @@ cvFloodFill( CvArr* arr, CvPoint seed_point,
depth = CV_MAT_DEPTH(type); depth = CV_MAT_DEPTH(type);
cn = CV_MAT_CN(type); cn = CV_MAT_CN(type);
if ( (cn != 1) && (cn != 3) )
{
CV_Error( CV_StsBadArg, "Number of channels in input image must be 1 or 3" );
return;
}
if( connectivity == 0 ) if( connectivity == 0 )
connectivity = 4; connectivity = 4;
else if( connectivity != 4 && connectivity != 8 ) else if( connectivity != 4 && connectivity != 8 )