Merge pull request #3854 from Dmitry-Me:reduceVariableScope8

This commit is contained in:
Vadim Pisarevsky 2015-03-24 15:13:34 +00:00
commit f7f10a7d2c

View File

@ -2449,7 +2449,6 @@ void cv::dft( InputArray _src0, OutputArray _dst, int flags, int nonzero_rows )
(DFTFunc)CCSIDFT_64f (DFTFunc)CCSIDFT_64f
}; };
AutoBuffer<uchar> buf; AutoBuffer<uchar> buf;
void *spec = 0;
Mat src0 = _src0.getMat(), src = src0; Mat src0 = _src0.getMat(), src = src0;
int prev_len = 0, stage = 0; int prev_len = 0, stage = 0;
bool inv = (flags & DFT_INVERSE) != 0; bool inv = (flags & DFT_INVERSE) != 0;
@ -2570,7 +2569,7 @@ void cv::dft( InputArray _src0, OutputArray _dst, int flags, int nonzero_rows )
sz = 2*len*complex_elem_size; sz = 2*len*complex_elem_size;
} }
spec = 0; void *spec = 0;
#ifdef USE_IPP_DFT #ifdef USE_IPP_DFT
if( CV_IPP_CHECK_COND && (len*count >= 64) ) // use IPP DFT if available if( CV_IPP_CHECK_COND && (len*count >= 64) ) // use IPP DFT if available
{ {