TIFF loader: Allocate large enough buffer when (bpp * ncn) > 8.

Conflicts:
	modules/highgui/src/grfmt_tiff.cpp

floodfill return value removed
This commit is contained in:
Andreas Stührk
2014-10-19 01:22:04 +02:00
committed by Dikay900
parent 653810e4df
commit 3ec0e0943c
2 changed files with 6 additions and 6 deletions

View File

@@ -487,7 +487,6 @@ int cv::floodFill( InputOutputArray _image, InputOutputArray _mask,
if ( (cn != 1) && (cn != 3) )
{
CV_Error( CV_StsBadArg, "Number of channels in input image must be 1 or 3" );
return;
}
if( connectivity == 0 )