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

#2258 fix

Browse Source
This commit is contained in:
Evgeny Talanin 2012-10-09 14:52:47 +04:00
parent 9ab19691d4
commit 7c71c8fa52
1 changed files with 27 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
modules/imgproc/src/floodfill.cpp
View File

@ -489,18 +489,15 @@ cvFloodFill( CvArr* arr, CvPoint seed_point,
if( is_simple ) if( is_simple )
{ {
/*int elem_size = CV_ELEM_SIZE(type); int elem_size = CV_ELEM_SIZE(type);
const uchar* seed_ptr = img->data.ptr + img->step*seed_point.y + elem_size*seed_point.x; const uchar* seed_ptr = img->data.ptr + img->step*seed_point.y + elem_size*seed_point.x;
// check if the new value is different from the current value at the seed point. for(i = 0; i < elem_size; i++)
// if they are exactly the same, use the generic version with mask to avoid infinite loops. if (seed_ptr[i] != nv_buf.b[i])
for( i = 0; i < elem_size; i++ )
if( seed_ptr[i] != ((uchar*)nv_buf)[i] )
break; break;
if( i == elem_size ) if (i != elem_size)
return;*/ {
if( type == CV_8UC1 ) if( type == CV_8UC1 )
icvFloodFill_CnIR(img->data.ptr, img->step, size, seed_point, nv_buf.b[0], icvFloodFill_CnIR(img->data.ptr, img->step, size, seed_point, nv_buf.b[0],
comp, flags, buffer, buffer_size); comp, flags, buffer, buffer_size);
@ -523,6 +520,7 @@ cvFloodFill( CvArr* arr, CvPoint seed_point,
CV_Error( CV_StsUnsupportedFormat, "" ); CV_Error( CV_StsUnsupportedFormat, "" );
return; return;
} }
}
if( !mask ) if( !mask )
{ {