Merged the trunk r8589:8653 - all changes related to build warnings

modules/imgproc/src/moments.cpp

@@ -106,7 +106,7 @@ static void icvContourMoments( CvSeq* contour, CvMoments* moments )
             yi_1 = ((CvPoint2D32f*)(reader.ptr))->y;
         }
         CV_NEXT_SEQ_ELEM( contour->elem_size, reader );
-        
+
         xi_12 = xi_1 * xi_1;
         yi_12 = yi_1 * yi_1;
 
@@ -208,7 +208,7 @@ static void momentsInTile( const cv::Mat& img, double* moments )
         const T* ptr = (const T*)(img.data + y*img.step);
         WT x0 = 0, x1 = 0, x2 = 0;
         MT x3 = 0;
-        
+
         for( x = 0; x < size.width; x++ )
         {
             WT p = ptr[x];
@@ -248,21 +248,21 @@ template<> void momentsInTile<uchar, int, int>( const cv::Mat& img, double* mome
     typedef int WT;
     typedef int MT;
     cv::Size size = img.size();
-    int x, y;
+    int y;
     MT mom[10] = {0,0,0,0,0,0,0,0,0,0};
     bool useSIMD = cv::checkHardwareSupport(CV_CPU_SSE2);
-    
+
     for( y = 0; y < size.height; y++ )
     {
         const T* ptr = img.ptr<T>(y);
         int x0 = 0, x1 = 0, x2 = 0, x3 = 0, x = 0;
-        
+
         if( useSIMD )
         {
             __m128i qx_init = _mm_setr_epi16(0, 1, 2, 3, 4, 5, 6, 7);
             __m128i dx = _mm_set1_epi16(8);
             __m128i z = _mm_setzero_si128(), qx0 = z, qx1 = z, qx2 = z, qx3 = z, qx = qx_init;
-            
+
             for( ; x <= size.width - 8; x += 8 )
             {
                 __m128i p = _mm_unpacklo_epi8(_mm_loadl_epi64((const __m128i*)(ptr + x)), z);
@@ -272,34 +272,34 @@ template<> void momentsInTile<uchar, int, int>( const cv::Mat& img, double* mome
                 qx1 = _mm_add_epi32(qx1, _mm_madd_epi16(p, qx));
                 qx2 = _mm_add_epi32(qx2, _mm_madd_epi16(p, sx));
                 qx3 = _mm_add_epi32(qx3, _mm_madd_epi16(px, sx));
-                
+
                 qx = _mm_add_epi16(qx, dx);
             }
             int CV_DECL_ALIGNED(16) buf[4];
             _mm_store_si128((__m128i*)buf, qx0);
             x0 = buf[0] + buf[1] + buf[2] + buf[3];
             _mm_store_si128((__m128i*)buf, qx1);
-            x1 = buf[0] + buf[1] + buf[2] + buf[3]; 
+            x1 = buf[0] + buf[1] + buf[2] + buf[3];
             _mm_store_si128((__m128i*)buf, qx2);
             x2 = buf[0] + buf[1] + buf[2] + buf[3];
             _mm_store_si128((__m128i*)buf, qx3);
             x3 = buf[0] + buf[1] + buf[2] + buf[3];
         }
-        
+
         for( ; x < size.width; x++ )
         {
             WT p = ptr[x];
             WT xp = x * p, xxp;
-            
+
             x0 += p;
             x1 += xp;
             xxp = xp * x;
             x2 += xxp;
             x3 += xxp * x;
         }
-        
+
         WT py = y * x0, sy = y*y;
-        
+
         mom[9] += ((MT)py) * sy;  // m03
         mom[8] += ((MT)x1) * sy;  // m12
         mom[7] += ((MT)x2) * y;  // m21
@@ -311,8 +311,8 @@ template<> void momentsInTile<uchar, int, int>( const cv::Mat& img, double* mome
         mom[1] += x1;             // m10
         mom[0] += x0;             // m00
     }
-    
-    for( x = 0; x < 10; x++ )
+
+    for(int x = 0; x < 10; x++ )
         moments[x] = (double)mom[x];
 }
 
@@ -366,7 +366,7 @@ CV_IMPL void cvMoments( const void* array, CvMoments* moments, int binary )
     type = CV_MAT_TYPE( mat->type );
     depth = CV_MAT_DEPTH( type );
     cn = CV_MAT_CN( type );
-    
+
     cv::Size size = cvGetMatSize( mat );
 
     if( cn > 1 && coi == 0 )
@@ -387,14 +387,14 @@ CV_IMPL void cvMoments( const void* array, CvMoments* moments, int binary )
         func = momentsInTile<double, double, double>;
     else
         CV_Error( CV_StsUnsupportedFormat, "" );
-        
+
     cv::Mat src0(mat);
 
     for( int y = 0; y < size.height; y += TILE_SIZE )
     {
         cv::Size tileSize;
         tileSize.height = std::min(TILE_SIZE, size.height - y);
-        
+
         for( int x = 0; x < size.width; x += TILE_SIZE )
         {
             tileSize.width = std::min(TILE_SIZE, size.width - x);
@@ -413,20 +413,20 @@ CV_IMPL void cvMoments( const void* array, CvMoments* moments, int binary )
                 cv::compare( src, 0, tmp, CV_CMP_NE );
                 src = tmp;
             }
-            
+
             double mom[10];
             func( src, mom );
-            
+
             if(binary)
             {
                 double s = 1./255;
                 for( int k = 0; k < 10; k++ )
                     mom[k] *= s;
             }
-            
+
             double xm = x * mom[0], ym = y * mom[0];
 
-            // accumulate moments computed in each tile 
+            // accumulate moments computed in each tile
 
             // + m00 ( = m00' )
             moments->m00 += mom[0];
@@ -451,7 +451,7 @@ CV_IMPL void cvMoments( const void* array, CvMoments* moments, int binary )
 
             // + m21 ( = m21' + x*(2*m11' + 2*y*m10' + x*m01' + x*y*m00') + y*m20')
             moments->m21 += mom[7] + x * (2 * (mom[4] + y * mom[1]) + x * (mom[2] + ym)) + y * mom[3];
-            
+
             // + m12 ( = m12' + y*(2*m11' + 2*x*m01' + y*m10' + x*y*m00') + x*m02')
             moments->m12 += mom[8] + y * (2 * (mom[4] + x * mom[2]) + y * (mom[1] + xm)) + x * mom[5];
 
@@ -601,9 +601,9 @@ Moments::operator CvMoments() const
 
     return m;
 }
-    
+
 }
-    
+
 cv::Moments cv::moments( InputArray _array, bool binaryImage )
 {
     CvMoments om;