mirror of
https://github.com/opencv/opencv.git
synced 2026-07-29 23:33:05 +04:00
fixed many warnings from GCC 4.6.1
This commit is contained in:
@@ -1475,9 +1475,9 @@ void cv::dft( InputArray _src0, OutputArray _dst, int flags, int nonzero_rows )
|
||||
int elem_size = (int)src.elemSize1(), complex_elem_size = elem_size*2;
|
||||
int factors[34];
|
||||
bool inplace_transform = false;
|
||||
int ipp_norm_flag = 0;
|
||||
#ifdef HAVE_IPP
|
||||
void *spec_r = 0, *spec_c = 0;
|
||||
int ipp_norm_flag = !(flags & DFT_SCALE) ? 8 : inv ? 2 : 1;
|
||||
#endif
|
||||
|
||||
CV_Assert( type == CV_32FC1 || type == CV_32FC2 || type == CV_64FC1 || type == CV_64FC2 );
|
||||
@@ -1506,8 +1506,6 @@ void cv::dft( InputArray _src0, OutputArray _dst, int flags, int nonzero_rows )
|
||||
(src.cols > 1 && inv && real_transform)) )
|
||||
stage = 1;
|
||||
|
||||
ipp_norm_flag = !(flags & DFT_SCALE) ? 8 : inv ? 2 : 1;
|
||||
|
||||
for(;;)
|
||||
{
|
||||
double scale = 1;
|
||||
|
||||
@@ -1592,11 +1592,6 @@ struct BatchDistInvoker
|
||||
{
|
||||
AutoBuffer<int> buf(src2->rows);
|
||||
int* bufptr = buf;
|
||||
Cv32suf val0;
|
||||
if( dist->type() == CV_32S )
|
||||
val0.i = INT_MAX;
|
||||
else
|
||||
val0.f = FLT_MAX;
|
||||
|
||||
for( int i = range.begin(); i < range.end(); i++ )
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user