pull/38/head
Evgeny Talanin 13 years ago
parent 9ab19691d4
commit 7c71c8fa52
  1. 14
      modules/imgproc/src/floodfill.cpp

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

Loading…
Cancel
Save