From 8758fe5342b2c8fbee3cfd5dc38582c92cbd8571 Mon Sep 17 00:00:00 2001 From: vp153 Date: Fri, 2 Apr 2010 22:26:16 +0000 Subject: [PATCH] fixed several GCC 4.2 warnings git-svn-id: https://code.ros.org/svn/opencv/trunk@2977 73c94f0f-984f-4a5f-82bc-2d8db8d8ee08 --- opencv/samples/c/find_obj_calonder.cpp | 2 +- opencv/src/cvaux/cvbgfg_gaussmix.cpp | 5 +++-- opencv/src/cvaux/cvcalonder.cpp | 3 ++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/opencv/samples/c/find_obj_calonder.cpp b/opencv/samples/c/find_obj_calonder.cpp index 88c4cef0..811f98b9 100644 --- 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 fbd768e7..9f493db5 100644 --- 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 10ae6523..272a7638 100644 --- 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)); } } -- 2.39.2