fixed warnings for gcc

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

diff --git a/opencv/tests/cv/src/bcameracalibration.cpp b/opencv/tests/cv/src/bcameracalibration.cpp
index a47ba22fbce6203a2f6883d41407818122377b4f..01e99da20abe65c114f0fdefecb9384ab4ece75c 100644 (file)
--- a/opencv/tests/cv/src/bcameracalibration.cpp
+++ b/opencv/tests/cv/src/bcameracalibration.cpp
@@ -50,7 +50,8 @@ using namespace std;
 class CV_CameraCalibrationBadArgTest : public CvBadArgTest\r
 {\r
 public:\r
-    CV_CameraCalibrationBadArgTest() : CvBadArgTest("calibrate-camera-c-badarg", "cvCalibrateCamera2"), imgSize(800, 600)        \r
+    CV_CameraCalibrationBadArgTest() : CvBadArgTest("calibrate-camera-c-badarg", "cvCalibrateCamera2"), \r
+        imgSize(800, 600)        \r
     { \r
         support_testing_modes = CvTS::CORRECTNESS_CHECK_MODE;         \r
         \r
@@ -472,9 +473,9 @@ public:
 protected:         \r
     void run_func(void) {};\r
 \r
-    Mat_<float> distCoeffs;\r
     Mat_<float> camMat;\r
-\r
+    Mat_<float> distCoeffs;\r
+    \r
     struct C_Caller\r
     {        \r
         CvMat* objectPoints;

diff --git a/opencv/tests/cv/src/cvcomposeRT.cpp b/opencv/tests/cv/src/cvcomposeRT.cpp
index a006b57ddbf6b3819d00806e55c7cc45ca9afe6a..e6d0b320e130e5594ad19eef3f88d3d7d7acbede 100644 (file)
--- a/opencv/tests/cv/src/cvcomposeRT.cpp
+++ b/opencv/tests/cv/src/cvcomposeRT.cpp
@@ -124,11 +124,11 @@ public:
      \r
 private:\r
     const mat_t& rv1, tv1, rv2, tv2;\r
+    double eps;\r
+    Mat_<double> ev;\r
     \r
     Differential& operator=(const Differential&);\r
-    Mat rv3_m, tv3_m, rv3_p, tv3_p;    \r
-    Mat_<double> ev;\r
-    double eps;\r
+    Mat rv3_m, tv3_m, rv3_p, tv3_p;          \r
 };\r
 \r
 class CV_composeRT_Test : public CvTest\r