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

IPP_VERSION_X100 was changed to:

Browse Source 
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;
This commit is contained in:
Pavel Vlasov 2015-09-29 17:24:18 +03:00
parent 14b006e808
commit 75c7917643
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/core/src/stat.cpp
View File

@ -2701,7 +2701,7 @@ static bool ipp_norm(Mat &src, int normType, Mat &mask, double &result)
return true; return true;
} }
} }
#if IPP_DISABLED_BLOCK #if IPP_DISABLE_BLOCK
typedef IppStatus (CV_STDCALL* ippiMaskNormFuncC3)(const void *, int, const void *, int, IppiSize, int, Ipp64f *); typedef IppStatus (CV_STDCALL* ippiMaskNormFuncC3)(const void *, int, const void *, int, IppiSize, int, Ipp64f *);
ippiMaskNormFuncC3 ippFuncC3 = ippiMaskNormFuncC3 ippFuncC3 =
normType == NORM_INF ? normType == NORM_INF ?