From b6d58d1d3b50ae67869d93a85e6274632a926b38 Mon Sep 17 00:00:00 2001 From: vbystricky Date: Wed, 9 Apr 2014 14:53:59 +0400 Subject: [PATCH] Fix ipp ifdef --- modules/imgproc/src/moments.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/imgproc/src/moments.cpp b/modules/imgproc/src/moments.cpp index f57b07f299..f3fb6962da 100644 --- a/modules/imgproc/src/moments.cpp +++ b/modules/imgproc/src/moments.cpp @@ -466,13 +466,13 @@ cv::Moments cv::moments( InputArray _src, bool binary ) if( cn > 1 ) CV_Error( CV_StsBadArg, "Invalid image type (must be single-channel)" ); -#if defined HAVE_IPP && (IPP_VERSION_MAJOR * 10 + IPP_VERSION_MINOR >= 81) +#if (IPP_VERSION_X100 >= 801) if (!binary) { IppiSize roi = {mat.cols, mat.rows}; IppiMomentState_64f *moment; - // ippiMomentInitAlloc_64f, ippiMomentFree_64f are deprecate in 8.1, but there are not another way - // to initialize IppiMomentState_64f. When GetStateSize and Init functions will appears we have to + // ippiMomentInitAlloc_64f, ippiMomentFree_64f are deprecated in 8.1, but there are not another way + // to initialize IppiMomentState_64f. When GetStateSize and Init functions will appear we have to // change our code. if (0 <= ippiMomentInitAlloc_64f(&moment, ippAlgHintAccurate)) { -- GitLab