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

Fix error in ipp function call

Browse Source
This commit is contained in:
vbystricky 2014-04-22 14:35:27 +04:00
parent 4211d8fbd9
commit e68a55cca2
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2442,7 +2442,7 @@ double cv::norm( InputArray _src1, InputArray _src2, int normType, InputArray _m
} }
else else
{ {
typedef IppStatus (CV_STDCALL* ippiNormRelFunc)(const void *, int, const void *, int, IppiSize, Ipp64f *, IppHintAlgorithm hint); typedef IppStatus (CV_STDCALL* ippiNormRelFunc)(const void *, int, const void *, int, IppiSize, Ipp64f *);
ippiNormRelFunc ippFunc = ippiNormRelFunc ippFunc =
normType == NORM_INF ? normType == NORM_INF ?
(type == CV_8UC1 ? (ippiNormRelFunc)ippiNormRel_Inf_8u_C1R : (type == CV_8UC1 ? (ippiNormRelFunc)ippiNormRel_Inf_8u_C1R :
@ -2465,7 +2465,7 @@ double cv::norm( InputArray _src1, InputArray _src2, int normType, InputArray _m
if( ippFunc ) if( ippFunc )
{ {
Ipp64f norm; Ipp64f norm;
if( ippFunc(src1.data, (int)src1.step[0], src2.data, (int)src2.step[0], sz, &norm, ippAlgHintAccurate) >= 0 ) if( ippFunc(src1.data, (int)src1.step[0], src2.data, (int)src2.step[0], sz, &norm) >= 0 )
return (double)norm; return (double)norm;
setIppErrorStatus(); setIppErrorStatus();
} }