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

GCC 4.8 warning array subscript is above array bounds fixed.

Browse Source 
tiff test fixed
This commit is contained in:
Alexander Smorkalov 2014-08-13 13:46:43 +04:00 committed by Dikay900
parent 5141141e2b
commit 6e1a595342
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/imgcodecs/test/test_grfmt.cpp
View File

@ -42,6 +42,8 @@
#include "test_precomp.hpp" #include "test_precomp.hpp"
#include <fstream>
using namespace cv; using namespace cv;
using namespace std; using namespace std;

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

@ -484,6 +484,12 @@ int cv::floodFill( InputOutputArray _image, InputOutputArray _mask,
int depth = img.depth(); int depth = img.depth();
int cn = img.channels(); int cn = img.channels();
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 )