fixed some warnings

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

diff --git a/opencv/samples/c/dft.c b/opencv/samples/c/dft.c
index 9f1abd6fdfa08e79414582059d1b6222196d4409..b34a9be705d80803fb078788d809bccfe5892c6d 100644 (file)
--- a/opencv/samples/c/dft.c
+++ b/opencv/samples/c/dft.c
@@ -9,7 +9,7 @@
 // src & dst arrays of equal size & type
 void cvShiftDFT(CvArr * src_arr, CvArr * dst_arr )
 {
-    CvMat * tmp;
+    CvMat * tmp=0;
     CvMat q1stub, q2stub;
     CvMat q3stub, q4stub;
     CvMat d1stub, d2stub;

diff --git a/opencv/src/cv/cvstardetector.cpp b/opencv/src/cv/cvstardetector.cpp
index 63d0618c9580668f6abb80b948363fb1140fbda4..68048ab7f0412c65080a79c17f0ca076f92abc5d 100644 (file)
--- a/opencv/src/cv/cvstardetector.cpp
+++ b/opencv/src/cv/cvstardetector.cpp
@@ -113,8 +113,9 @@ icvStarDetectorComputeResponses( const CvMat* img, CvMat* responses, CvMat* size
 #if CV_SSE2
     __m128 invSizes4[MAX_PATTERN][2];
     __m128 sizes1_4[MAX_PATTERN];
-    int absmask = 0x7fffffff;
-    __m128 absmask4 = _mm_set1_ps((float&)absmask);
+    Cv32suf absmask;
+    absmask.i = 0x7fffffff;
+    __m128 absmask4 = _mm_set1_ps(absmask.f);
 #endif
     CvStarFeature f[MAX_PATTERN];
 

diff --git a/opencv/src/cvaux/cvcorrespond.cpp b/opencv/src/cvaux/cvcorrespond.cpp
index c0c55e15689d6b9840e9f2a1324a257da991b0f8..1eef4a75be571afdcd45b42a6a79a3fe8520ca15 100644 (file)
--- a/opencv/src/cvaux/cvcorrespond.cpp
+++ b/opencv/src/cvaux/cvcorrespond.cpp
@@ -390,14 +390,9 @@ cvDynamicCorrespondMulti( int lines,    /* number of scanlines */
                           int *second, int *second_runs, int *first_corr,       /* s0'|e0'|s1'|e1'|... */
                           int *second_corr )
 {
-    CV_FUNCNAME( "cvDynamicCorrespondMulti" );
-    __BEGIN__;
-
     IPPI_CALL( icvDynamicCorrespondMulti( lines,        /* number of scanlines */
                                           first,        /* s0|w0|s1|w1|...s(n-1)|w(n-1)|sn */
                                           first_runs,   /* numbers of runs */
                                           second, second_runs, first_corr,      /* s0'|e0'|s1'|e1'|... */
                                           second_corr ));
-    __CLEANUP__;
-    __END__;
 }

diff --git a/opencv/src/ml/mlboost.cpp b/opencv/src/ml/mlboost.cpp
index db9dad8e2b828f436b78aa77912a3c28da1a6a5f..5293830555eedeb2d8415adb29ead75ead2f388e 100644 (file)
--- a/opencv/src/ml/mlboost.cpp
+++ b/opencv/src/ml/mlboost.cpp
@@ -1769,9 +1769,6 @@ CvBoost::predict( const CvMat* _sample, const CvMat* _missing,
 \r
 float CvBoost::calc_error( CvMLData* _data, int type )\r
 {\r
-    CV_FUNCNAME( "CvBoost::calc_error" );\r
-\r
-    __BEGIN__;\r
     float err = 0;\r
     const CvMat* values = _data->get_values();
     const CvMat* response = _data->get_response();
@@ -1815,8 +1812,6 @@ float CvBoost::calc_error( CvMLData* _data, int type )
         err = sample_count ? err / (float)sample_count : -FLT_MAX;    \r
     }\r
     return err;\r
-\r
-    __END__;\r
 }\r
 \r
 void CvBoost::write_params( CvFileStorage* fs )\r

diff --git a/opencv/src/ml/mldata.cpp b/opencv/src/ml/mldata.cpp
index d8657fd34acb05fae44b16ceac0c8e778dc6a02a..c1da701348f9f4692b54248497af4087cf1fef15 100644 (file)
--- a/opencv/src/ml/mldata.cpp
+++ b/opencv/src/ml/mldata.cpp
@@ -139,10 +139,6 @@ int CvMLData :: read_csv(const char* filename)
     int cols_count = 0;    \r
     uchar *var_types_ptr = 0;\r
 \r
-    CV_FUNCNAME( "CvMLData :: read_csv" );\r
-\r
-    __BEGIN__;\r
-\r
     clear();\r
 \r
     file = fopen( filename, "rt" );\r
@@ -230,8 +226,6 @@ int CvMLData :: read_csv(const char* filename)
     if ( cvNorm( missing, 0, CV_L1 ) < FLT_EPSILON )\r
         cvReleaseMat( &missing );\r
 \r
-    __END__;\r
-\r
     cvReleaseMemStorage( &storage );\r
     delete []el_ptr;\r
     delete []buf;\r
@@ -670,4 +664,4 @@ void CvMLData :: chahge_var_idx( int vi, bool state )
     __END__;
 }
 
-/* End of file. */
\ No newline at end of file
+/* End of file. */\r

diff --git a/opencv/src/ml/mltree.cpp b/opencv/src/ml/mltree.cpp
index 326357a9b75005a32adc5ef21a434e619d6d5bc5..9da7db6da681572e0bcb474ba3fe8da735e2a319 100644 (file)
--- a/opencv/src/ml/mltree.cpp
+++ b/opencv/src/ml/mltree.cpp
@@ -3144,9 +3144,6 @@ void CvDTree::split_node_data( CvDTreeNode* node )
 \r
 float CvDTree::calc_error( CvMLData* _data, int type )\r
 {\r
-    CV_FUNCNAME( "CvDTree::calc_error" );\r
-\r
-    __BEGIN__;\r
     float err = 0;\r
     const CvMat* values = _data->get_values();
     const CvMat* response = _data->get_response();
@@ -3190,8 +3187,6 @@ float CvDTree::calc_error( CvMLData* _data, int type )
         err = sample_count ? err / (float)sample_count : -FLT_MAX;    \r
     }\r
     return err;\r
-\r
-    __END__;\r
 }\r
 \r
 void CvDTree::prune_cv()\r