fixed several GCC 4.2 warnings

git-svn-id: https://code.ros.org/svn/opencv/trunk@2977 73c94f0f-984f-4a5f-82bc-2d8db8d8ee08

diff --git a/opencv/samples/c/find_obj_calonder.cpp b/opencv/samples/c/find_obj_calonder.cpp
index 88c4cef0dbe9a2b3bb02979abd42ac175527cee1..811f98b94b0f38ce705a133dfc2699294b3b3d2e 100644 (file)
--- a/opencv/samples/c/find_obj_calonder.cpp
+++ b/opencv/samples/c/find_obj_calonder.cpp
@@ -302,4 +302,4 @@ int main( int argc, char** argv )
        cvReleaseImage(&test_image);
 
        return 0;
-}
\ No newline at end of file
+}

diff --git a/opencv/src/cvaux/cvbgfg_gaussmix.cpp b/opencv/src/cvaux/cvbgfg_gaussmix.cpp
index fbd768e7044fbde28051823866a7bb53732a1364..9f493db5961a02a81d95328c124ad630b447fbbd 100644 (file)
--- a/opencv/src/cvaux/cvbgfg_gaussmix.cpp
+++ b/opencv/src/cvaux/cvbgfg_gaussmix.cpp
@@ -429,7 +429,6 @@ static int CV_CDECL
 icvUpdateGaussianBGModel( IplImage* curr_frame, CvGaussBGModel*  bg_model, double learningRate )
 {
     int region_count = 0;
-    CvSeq *first_seq = NULL, *prev_seq = NULL, *seq = NULL;
     
     cv::Mat image = cv::cvarrToMat(curr_frame), mask = cv::cvarrToMat(bg_model->foreground);
     
@@ -458,7 +457,9 @@ icvUpdateGaussianBGModel( IplImage* curr_frame, CvGaussBGModel*  bg_model, doubl
     //cvMorphologyEx( bg_model->foreground, bg_model->foreground, 0, 0, CV_MOP_OPEN, 1 );
     //cvMorphologyEx( bg_model->foreground, bg_model->foreground, 0, 0, CV_MOP_CLOSE, 1 );
     
-    /*cvFindContours( bg_model->foreground, bg_model->storage, &first_seq, sizeof(CvContour), CV_RETR_LIST );
+    /*
+    CvSeq *first_seq = NULL, *prev_seq = NULL, *seq = NULL;
+    cvFindContours( bg_model->foreground, bg_model->storage, &first_seq, sizeof(CvContour), CV_RETR_LIST );
     for( seq = first_seq; seq; seq = seq->h_next )
     {
         CvContour* cnt = (CvContour*)seq;

diff --git a/opencv/src/cvaux/cvcalonder.cpp b/opencv/src/cvaux/cvcalonder.cpp
index 10ae652336fa3648922c29a68e66872ec8965ba2..272a76389975924379bdc5c17be6c6afcc319ace 100644 (file)
--- a/opencv/src/cvaux/cvcalonder.cpp
+++ b/opencv/src/cvaux/cvcalonder.cpp
@@ -173,7 +173,8 @@ namespace cv {
                                
                                make_patch(keypt_it->image, Point2f(keypt_it->x,keypt_it->y) ,patch, Size(PATCH_SIZE,PATCH_SIZE),rng);
 
-                               addExample(class_id, getData(&((IplImage)patch)));
+                IplImage _patch = patch;
+                               addExample(class_id, getData(&_patch));
                        }
                }