merged the trunk r8704:8716

samples/c/blobtrack_sample.cpp

@@ -368,7 +368,7 @@ static void print_params(CvVSModule* pM, const char* module, const char* log_nam
 int main(int argc, char* argv[])
 {   /* Main function: */
     CvCapture*                  pCap = NULL;
-    CvBlobTrackerAutoParam1     param = {0};
+    CvBlobTrackerAutoParam1     param = {0,0,0,0,0,0,0,0};
     CvBlobTrackerAuto*          pTracker = NULL;
 
     //float       scale = 1;

samples/c/contours.c

@@ -22,6 +22,8 @@ static void on_trackbar(int pos)
     IplImage* cnt_img = cvCreateImage( cvSize(w,w), 8, 3 );
     CvSeq* _contours = contours;
     int _levels = levels - 3;
+    (void)pos;
+
     if( _levels <= 0 ) // get to the nearest face to make it look more funny
         _contours = _contours->h_next->h_next->h_next;
     cvZero( cnt_img );
@@ -58,6 +60,8 @@ int main(int argc, char* argv[])
     IplImage* img32f = cvCreateImage( cvSize(w,w), IPL_DEPTH_32F, 1 );
     IplImage* img32s = cvCreateImage( cvSize(w,w), IPL_DEPTH_32S, 1 );
     IplImage* img3 = cvCreateImage( cvSize(w,w), 8, 3 );
+    (void)argc; (void)argv;
+
     help();
     cvZero( img );
 

samples/c/delaunay.c

@@ -231,9 +231,7 @@ static void run(void)
 
 int main( int argc, char** argv )
 {
-#ifdef _MSC_VER
-    argc, argv;
-#endif
+    (void)argc; (void)argv;
     help();
     run();
     return 0;

samples/c/fback_c.c

@@ -17,6 +17,7 @@ static void drawOptFlowMap(const CvMat* flow, CvMat* cflowmap, int step,
                     double scale, CvScalar color)
 {
     int x, y;
+    (void)scale;
     for( y = 0; y < cflowmap->rows; y += step)
         for( x = 0; x < cflowmap->cols; x += step)
         {
@@ -31,6 +32,7 @@ int main( int argc, char** argv )
 {
     CvCapture* capture = cvCreateCameraCapture(0);
     CvMat* prevgray = 0, *gray = 0, *flow = 0, *cflow = 0;
+    (void)argc; (void)argv;
 
     help();
 

samples/c/morphology.c

@@ -19,6 +19,8 @@ static void OpenClose(int pos)
 {
     int n = open_close_pos - max_iters;
     int an = n > 0 ? n : -n;
+    (void)pos;
+
     element = cvCreateStructuringElementEx( an*2+1, an*2+1, an, an, element_shape, 0 );
     if( n < 0 )
     {
@@ -39,6 +41,8 @@ static void ErodeDilate(int pos)
 {
     int n = erode_dilate_pos - max_iters;
     int an = n > 0 ? n : -n;
+    (void)pos;
+
     element = cvCreateStructuringElementEx( an*2+1, an*2+1, an, an, element_shape, 0 );
     if( n < 0 )
     {

samples/c/pyramid_segmentation.c

@@ -34,6 +34,7 @@ CvPoint pt1, pt2;
 
 static void ON_SEGMENT(int a)
 {
+    (void)a;
     cvPyrSegmentation(image0, image1, storage, &comp,
                       level, threshold1+1, threshold2+1);