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

polished the patch

Browse Source
This commit is contained in:
Vadim Pisarevsky 2013-08-07 22:34:29 +04:00
parent 10fde1ca5c
commit d5539975d7
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
modules/core/src/dxt.cpp
View File

@ -1547,7 +1547,11 @@ void cv::dft( InputArray _src0, OutputArray _dst, int flags, int nonzero_rows )
spec = 0; spec = 0;
#ifdef HAVE_IPP #ifdef HAVE_IPP
if( depth == CV_32F && len*count >= 64 ) // use IPP DFT if available if(
#if IPP_VERSION_MAJOR >= 7
depth == CV_32F && // IPP 7.x and 8.0 have bug somewhere in double-precision DFT
#endif
len*count >= 64 ) // use IPP DFT if available
{ {
int specsize=0, initsize=0, worksize=0; int specsize=0, initsize=0, worksize=0;
IppDFTGetSizeFunc getSizeFunc = 0; IppDFTGetSizeFunc getSizeFunc = 0;
@ -1556,20 +1560,28 @@ void cv::dft( InputArray _src0, OutputArray _dst, int flags, int nonzero_rows )
if( real_transform && stage == 0 ) if( real_transform && stage == 0 )
{ {
if( depth == CV_32F ) if( depth == CV_32F )
getSizeFunc = (IppDFTGetSizeFunc)ippsDFTGetSize_R_32f, {
getSizeFunc = ippsDFTGetSize_R_32f;
initFunc = (IppDFTInitFunc)ippsDFTInit_R_32f; initFunc = (IppDFTInitFunc)ippsDFTInit_R_32f;
}
else else
getSizeFunc = (IppDFTGetSizeFunc)ippsDFTGetSize_R_64f, {
getSizeFunc = ippsDFTGetSize_R_64f;
initFunc = (IppDFTInitFunc)ippsDFTInit_R_64f; initFunc = (IppDFTInitFunc)ippsDFTInit_R_64f;
}
} }
else else
{ {
if( depth == CV_32F ) if( depth == CV_32F )
getSizeFunc = (IppDFTGetSizeFunc)ippsDFTGetSize_C_32fc, {
getSizeFunc = ippsDFTGetSize_C_32fc;
initFunc = (IppDFTInitFunc)ippsDFTInit_C_32fc; initFunc = (IppDFTInitFunc)ippsDFTInit_C_32fc;
}
else else
getSizeFunc = (IppDFTGetSizeFunc)ippsDFTGetSize_C_64fc, {
getSizeFunc = ippsDFTGetSize_C_64fc;
initFunc = (IppDFTInitFunc)ippsDFTInit_C_64fc; initFunc = (IppDFTInitFunc)ippsDFTInit_C_64fc;
}
} }
if( getSizeFunc(len, ipp_norm_flag, ippAlgHintNone, &specsize, &initsize, &worksize) >= 0 ) if( getSizeFunc(len, ipp_norm_flag, ippAlgHintNone, &specsize, &initsize, &worksize) >= 0 )
{ {