generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix ipp ifdef

Browse Source
This commit is contained in:
vbystricky 2014-04-09 14:53:59 +04:00
parent d9013a85f1
commit b6d58d1d3b
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/imgproc/src/moments.cpp
View File

@ -466,13 +466,13 @@ cv::Moments cv::moments( InputArray _src, bool binary )
if( cn > 1 ) if( cn > 1 )
CV_Error( CV_StsBadArg, "Invalid image type (must be single-channel)" ); 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) if (!binary)
{ {
IppiSize roi = {mat.cols, mat.rows}; IppiSize roi = {mat.cols, mat.rows};
IppiMomentState_64f *moment; IppiMomentState_64f *moment;
// ippiMomentInitAlloc_64f, ippiMomentFree_64f are deprecate in 8.1, but there are not another way // 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 appears we have to // to initialize IppiMomentState_64f. When GetStateSize and Init functions will appear we have to
// change our code. // change our code.
if (0 <= ippiMomentInitAlloc_64f(&moment, ippAlgHintAccurate)) if (0 <= ippiMomentInitAlloc_64f(&moment, ippAlgHintAccurate))
{ {