Fix for pullrequest comment

diff --git a/modules/core/src/stat.cpp b/modules/core/src/stat.cpp
index 8015c3c..01211f0 100644 (file)
--- a/modules/core/src/stat.cpp
+++ b/modules/core/src/stat.cpp
@@ -972,7 +972,7 @@ void cv::meanStdDev( InputArray _src, OutputArray _mean, OutputArray _sdv, Input
             ippiMeanStdDevFuncC1 ippFuncC1 =
             type == CV_8UC1 ? (ippiMeanStdDevFuncC1)ippiMean_StdDev_8u_C1R :
             type == CV_16UC1 ? (ippiMeanStdDevFuncC1)ippiMean_StdDev_16u_C1R :
-#if ((IPP_VERSION_MAJOR >= 8) && (IPP_VERSION_MINOR >= 1)) || (IPP_VERSION_MAJOR > 8)
+#if (IPP_VERSION_MAJOR * 10 + IPP_VERSION_MINOR >= 81)
             type == CV_32FC1 ? (ippiMeanStdDevFuncC1)ippiMean_StdDev_32f_C1R ://Aug 2013: bug in IPP 7.1, 8.0
 #endif
             0;
@@ -2113,7 +2113,7 @@ double cv::norm( InputArray _src, int normType, InputArray _mask )
                 type == CV_16UC3 ? (ippiNormFuncNoHint)ippiNorm_Inf_16u_C3R :
                 type == CV_16UC4 ? (ippiNormFuncNoHint)ippiNorm_Inf_16u_C4R :
                 type == CV_16SC1 ? (ippiNormFuncNoHint)ippiNorm_Inf_16s_C1R :
-#if ((IPP_VERSION_MAJOR >= 8) && (IPP_VERSION_MINOR >= 1)) || (IPP_VERSION_MAJOR > 8)
+#if (IPP_VERSION_MAJOR * 10 + IPP_VERSION_MINOR >= 81)
                 type == CV_16SC3 ? (ippiNormFuncNoHint)ippiNorm_Inf_16s_C3R : //Aug 2013: problem in IPP 7.1, 8.0 : -32768
                 type == CV_16SC4 ? (ippiNormFuncNoHint)ippiNorm_Inf_16s_C4R : //Aug 2013: problem in IPP 7.1, 8.0 : -32768
 #endif
@@ -2545,7 +2545,7 @@ double cv::norm( InputArray _src1, InputArray _src2, int normType, InputArray _m
                 type == CV_16UC3 ? (ippiNormDiffFuncNoHint)ippiNormDiff_Inf_16u_C3R :
                 type == CV_16UC4 ? (ippiNormDiffFuncNoHint)ippiNormDiff_Inf_16u_C4R :
                 type == CV_16SC1 ? (ippiNormDiffFuncNoHint)ippiNormDiff_Inf_16s_C1R :
-#if ((IPP_VERSION_MAJOR >= 8) && (IPP_VERSION_MINOR >= 1)) || (IPP_VERSION_MAJOR > 8)
+#if (IPP_VERSION_MAJOR * 10 + IPP_VERSION_MINOR >= 81)
                 type == CV_16SC3 ? (ippiNormDiffFuncNoHint)ippiNormDiff_Inf_16s_C3R : //Aug 2013: problem in IPP 7.1, 8.0 : -32768
                 type == CV_16SC4 ? (ippiNormDiffFuncNoHint)ippiNormDiff_Inf_16s_C4R : //Aug 2013: problem in IPP 7.1, 8.0 : -32768
 #endif

diff --git a/modules/imgproc/src/color.cpp b/modules/imgproc/src/color.cpp
index 3a0972b..95f4eb4 100644 (file)
--- a/modules/imgproc/src/color.cpp
+++ b/modules/imgproc/src/color.cpp
@@ -298,7 +298,7 @@ static ippiReorderFunc ippiSwapChannelsC3RTab[] =
     0, (ippiReorderFunc)ippiSwapChannels_32f_C3R, 0, 0
 };
 
-#if ((IPP_VERSION_MAJOR >= 8) && (IPP_VERSION_MINOR >= 1)) || (IPP_VERSION_MAJOR > 8)
+#if (IPP_VERSION_MAJOR * 10 + IPP_VERSION_MINOR >= 81)
 static ippiReorderFunc ippiSwapChannelsC4RTab[] =
 {
     (ippiReorderFunc)ippiSwapChannels_8u_C4R, 0, (ippiReorderFunc)ippiSwapChannels_16u_C4R, 0,
@@ -3254,7 +3254,7 @@ void cv::cvtColor( InputArray _src, OutputArray _dst, int code, int dcn )
                 if( CvtColorIPPLoopCopy(src, dst, IPPReorderFunctor(ippiSwapChannelsC3RTab[depth], 2, 1, 0)) )
                     return;
             }
-#if ((IPP_VERSION_MAJOR >= 8) && (IPP_VERSION_MINOR >= 1)) || (IPP_VERSION_MAJOR > 8)
+#if (IPP_VERSION_MAJOR * 10 + IPP_VERSION_MINOR >= 81)
             else if( code == CV_RGBA2BGRA )
             {
                 if( CvtColorIPPLoopCopy(src, dst, IPPReorderFunctor(ippiSwapChannelsC4RTab[depth], 2, 1, 0)) )

diff --git a/modules/imgproc/src/morph.cpp b/modules/imgproc/src/morph.cpp
index df055c8..1fd93f8 100644 (file)
--- a/modules/imgproc/src/morph.cpp
+++ b/modules/imgproc/src/morph.cpp
@@ -1136,7 +1136,7 @@ private:
     Scalar borderValue;
 };
 
-#if defined (HAVE_IPP) && (((IPP_VERSION_MAJOR >= 8) && (IPP_VERSION_MINOR >= 1)) || (IPP_VERSION_MAJOR > 8))
+#if defined (HAVE_IPP) && (IPP_VERSION_MAJOR * 10 + IPP_VERSION_MINOR >= 81)
 static bool IPPMorphReplicate(int op, const Mat &src, Mat &dst, const Mat &kernel,
                               const Size& ksize, const Point &anchor, bool rectKernel)
 {
@@ -1459,7 +1459,7 @@ static void morphOp( int op, InputArray _src, OutputArray _dst,
     Size ksize = kernel.data ? kernel.size() : Size(3,3);
     anchor = normalizeAnchor(anchor, ksize);
 
-#if defined (HAVE_IPP) && (((IPP_VERSION_MAJOR >= 8) && (IPP_VERSION_MINOR >= 1)) || (IPP_VERSION_MAJOR > 8))
+#if defined (HAVE_IPP) && (IPP_VERSION_MAJOR * 10 + IPP_VERSION_MINOR >= 81)
     if( IPPMorphOp(op, _src, _dst, kernel, anchor, iterations, borderType, borderValue) )
         return;
 #endif

diff --git a/modules/imgproc/src/smooth.cpp b/modules/imgproc/src/smooth.cpp
index 65d2dce..629d668 100644 (file)
--- a/modules/imgproc/src/smooth.cpp
+++ b/modules/imgproc/src/smooth.cpp
@@ -1109,7 +1109,7 @@ void cv::GaussianBlur( InputArray _src, OutputArray _dst, Size ksize,
         return;
 #endif
 
-#if defined (HAVE_IPP) && (((IPP_VERSION_MAJOR >= 8) && (IPP_VERSION_MINOR >= 1)) || (IPP_VERSION_MAJOR > 8))
+#if defined (HAVE_IPP) && (IPP_VERSION_MAJOR * 10 + IPP_VERSION_MINOR >= 81)
     if( type == CV_32FC1 && sigma1 == sigma2 && ksize.width == ksize.height && sigma1 != 0.0 )
     {
         Mat src = _src.getMat(), dst = _dst.getMat();