IPP_VERSION_X100 was changed to:

IPP_VERSION_MAJOR * 100 + IPP_VERSION_MINOR*10 + IPP_VERSION_UPDATE to manage changes between updates more easily. IPP_DISABLE_BLOCK was added to ease tracking of disabled IPP functions;
9 years ago · 75c7917643
parent 14b006e808
commit 75c7917643
1 changed files with 1 additions and 1 deletions
--- a/modules/core/src/stat.cpp
+++ b/modules/core/src/stat.cpp
@ -2701,7 +2701,7 @@ static bool ipp_norm(Mat &src, int normType, Mat &mask, double &result)
                    return true;
                }
            }
-#if IPP_DISABLED_BLOCK
+#if IPP_DISABLE_BLOCK
            typedef IppStatus (CV_STDCALL* ippiMaskNormFuncC3)(const void *, int, const void *, int, IppiSize, int, Ipp64f *);
            ippiMaskNormFuncC3 ippFuncC3 =
                normType == NORM_INF ?