From a73809e6fc986ca84f1b7c58492ba7433396b5e6 Mon Sep 17 00:00:00 2001 From: "Fco. Javier Delgado del Hoyo" Date: Wed, 25 Jun 2014 11:46:05 +0200 Subject: [PATCH 1/2] Fix GCC 4.9 compiler warning --- modules/imgproc/src/morph.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/imgproc/src/morph.cpp b/modules/imgproc/src/morph.cpp index 3ab495d75..f05c5afc1 100644 --- a/modules/imgproc/src/morph.cpp +++ b/modules/imgproc/src/morph.cpp @@ -1257,7 +1257,7 @@ static bool IPPMorphReplicate(int op, const Mat &src, Mat &dst, const Mat &kerne } #undef IPP_MORPH_CASE -#if defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ == 8 +#if defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ > 8 return false; /// It disables false positive warning in GCC 4.8.2 #endif } From 47e345bcb6177ee701baf27357abeb2d3ab6aa9a Mon Sep 17 00:00:00 2001 From: "Fco. Javier Delgado del Hoyo" Date: Wed, 25 Jun 2014 11:49:26 +0200 Subject: [PATCH 2/2] Change comment according to fix --- modules/imgproc/src/morph.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/imgproc/src/morph.cpp b/modules/imgproc/src/morph.cpp index f05c5afc1..eaae9b6d0 100644 --- a/modules/imgproc/src/morph.cpp +++ b/modules/imgproc/src/morph.cpp @@ -1258,7 +1258,7 @@ static bool IPPMorphReplicate(int op, const Mat &src, Mat &dst, const Mat &kerne #undef IPP_MORPH_CASE #if defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ > 8 - return false; /// It disables false positive warning in GCC 4.8.2 + return false; /// It disables false positive warning in GCC 4.8 and further #endif } }