1
0
mirror of https://github.com/opencv/opencv.git synced 2026-07-30 07:43:03 +04:00

fixed many warnings from GCC 4.6.1

This commit is contained in:
Vadim Pisarevsky
2012-03-17 09:22:31 +00:00
parent 4985c1b632
commit 846e37ded5
34 changed files with 84 additions and 147 deletions
+1 -3
View File
@@ -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;
-5
View File
@@ -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++ )
{
+1 -3
View File
@@ -1932,10 +1932,9 @@ void Core_SVDTest::prepare_to_validation( int /*test_case_idx*/ )
{
Mat& input = test_mat[INPUT][0];
int depth = input.depth();
int m = input.rows, n = input.cols, min_size = MIN(m, n);
int i, m = input.rows, n = input.cols, min_size = MIN(m, n);
Mat *src, *dst, *w;
double prev = 0, threshold = depth == CV_32F ? FLT_EPSILON : DBL_EPSILON;
int i, step;
if( have_u )
{
@@ -1954,7 +1953,6 @@ void Core_SVDTest::prepare_to_validation( int /*test_case_idx*/ )
}
w = &test_mat[TEMP][0];
step = w->rows == 1 ? 1 : (int)w->step1();
for( i = 0; i < min_size; i++ )
{
double normval = 0, aii;