From 6e1a5953429c6a95cc4d370ce35ac781b87b683b Mon Sep 17 00:00:00 2001 From: Alexander Smorkalov Date: Wed, 13 Aug 2014 13:46:43 +0400 Subject: [PATCH] GCC 4.8 warning array subscript is above array bounds fixed. tiff test fixed --- modules/imgcodecs/test/test_grfmt.cpp | 2 ++ modules/imgproc/src/floodfill.cpp | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/modules/imgcodecs/test/test_grfmt.cpp b/modules/imgcodecs/test/test_grfmt.cpp index 92238a95f0..54b7c215db 100644 --- a/modules/imgcodecs/test/test_grfmt.cpp +++ b/modules/imgcodecs/test/test_grfmt.cpp @@ -42,6 +42,8 @@ #include "test_precomp.hpp" +#include + using namespace cv; using namespace std; diff --git a/modules/imgproc/src/floodfill.cpp b/modules/imgproc/src/floodfill.cpp index 54a1fc976f..69228b3397 100644 --- a/modules/imgproc/src/floodfill.cpp +++ b/modules/imgproc/src/floodfill.cpp @@ -484,6 +484,12 @@ int cv::floodFill( InputOutputArray _image, InputOutputArray _mask, int depth = img.depth(); 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 ) connectivity = 4; else if( connectivity != 4 && connectivity != 8 )