fixed a few MSVC warnings

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

diff --git a/opencv/src/cv/cvcheckchessboard.cpp b/opencv/src/cv/cvcheckchessboard.cpp
index 0e5b9ff0f183a398891a2cbfe4d2125a8fcf1d96..03d112dde126cb292a798356a05681c1691dbc43 100644 (file)
--- a/opencv/src/cv/cvcheckchessboard.cpp
+++ b/opencv/src/cv/cvcheckchessboard.cpp
@@ -110,9 +110,9 @@ int cvCheckChessboard(IplImage* src, CvSize size)
     }
     
     const int erosion_count = 1;
-    const double black_level = 20;
-    const double white_level = 130;
-    const double black_white_gap = 70;
+    const float black_level = 20.f;
+    const float white_level = 130.f;
+    const float black_white_gap = 70.f;
     
 #if defined(DEBUG_WINDOWS)
     cvNamedWindow("1", 1);
@@ -177,8 +177,8 @@ int cvCheckChessboard(IplImage* src, CvSize size)
                 // check the number of black and white squares
                 std::vector<int> counts;
                 countClasses(quads, i, j, counts);
-                const int black_count = ceil(size.width/2.0)*ceil(size.height/2.0);
-                const int white_count = floor(size.width/2.0)*floor(size.height/2.0);
+                const int black_count = cvRound(ceil(size.width/2.0)*ceil(size.height/2.0));
+                const int white_count = cvRound(floor(size.width/2.0)*floor(size.height/2.0));
                 if(counts[0] < black_count*0.75 ||
                    counts[1] < white_count*0.75)
                 {

diff --git a/opencv/src/cv/cvcornersubpix.cpp b/opencv/src/cv/cvcornersubpix.cpp
index c88a6bf33fda22bedf62a6e64d410c5a2f09af52..f4d6cf3515736235d8e97094c8d9ded868ef71c7 100644 (file)
--- a/opencv/src/cv/cvcornersubpix.cpp
+++ b/opencv/src/cv/cvcornersubpix.cpp
@@ -61,8 +61,8 @@ cvFindCornerSubPix( const void* srcarr, CvPoint2D32f* corners,
     double coeff;\r
     CvSize size, src_buf_size;\r
     int i, j, k, pt_i;\r
-    int max_iters;\r
-    double eps;\r
+    int max_iters = 10;\r
+    double eps = 0;\r
 \r
     CvMat stub, *src = (CvMat*)srcarr;\r
     src = cvGetMat( srcarr, &stub );\r

diff --git a/opencv/src/cv/cvstardetector.cpp b/opencv/src/cv/cvstardetector.cpp
index ac7828934dc8dc3183115ffa2146cfad2c3bac9a..a5975048de4ed3ffc3cce733047a356bf46d9928 100644 (file)
--- a/opencv/src/cv/cvstardetector.cpp
+++ b/opencv/src/cv/cvstardetector.cpp
@@ -120,7 +120,7 @@ icvStarDetectorComputeResponses( const CvMat* img, CvMat* responses, CvMat* size
     CvStarFeature f[MAX_PATTERN];
 
     CvMat *sum = 0, *tilted = 0, *flatTilted = 0;
-    int x, y, i=0, rows = img->rows, cols = img->cols, step;
+    int y, i=0, rows = img->rows, cols = img->cols, step;
     int border, npatterns=0, maxIdx=0;
 #ifdef _OPENMP
     int nthreads = cvGetNumThreads();