Merge pull request #2895 from fradelg:master

This commit is contained in:
Vadim Pisarevsky 2014-07-01 17:16:22 +00:00
commit fe4bdcd71b

View File

@ -1257,8 +1257,8 @@ 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
#if defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ > 8
return false; /// It disables false positive warning in GCC 4.8 and further
#endif
}
}