fixed some more MSVC2010 warnings

samples/cpp/calibration.cpp

@@ -54,7 +54,7 @@ static double computeReprojectionErrors(
                       cameraMatrix, distCoeffs, imagePoints2);
         err = norm(Mat(imagePoints[i]), Mat(imagePoints2), CV_L1 );
         int n = (int)objectPoints[i].size();
-        perViewErrors[i] = err/n;
+        perViewErrors[i] = (float)(err/n);
         totalErr += err;
         totalPoints += n;
     }
@@ -94,8 +94,7 @@ static bool runCalibration( vector<vector<Point2f> > imagePoints,
     calibrateCamera(objectPoints, imagePoints, imageSize, cameraMatrix,
                     distCoeffs, rvecs, tvecs, flags);
     
-    bool ok = checkRange( cameraMatrix, CV_CHECK_QUIET ) &&
-            checkRange( distCoeffs, CV_CHECK_QUIET );
+    bool ok = checkRange(cameraMatrix) && checkRange(distCoeffs);
     
     totalAvgErr = computeReprojectionErrors(objectPoints, imagePoints,
                 rvecs, tvecs, cameraMatrix, distCoeffs, reprojErrs);

samples/cpp/contours2.cpp

@@ -10,7 +10,7 @@ int levels = 3;
 vector<vector<Point> > contours;
 vector<Vec4i> hierarchy;
 
-void on_trackbar(int pos, void*)
+void on_trackbar(int, void*)
 {
 	Mat cnt_img = Mat::zeros(w, w, CV_8UC3);
     int _levels = levels - 3;
@@ -20,7 +20,7 @@ void on_trackbar(int pos, void*)
     imshow("contours", cnt_img);
 }
 
-int main( int argc, char** argv )
+int main( int, char** )
 {
     Mat img = Mat::zeros(w, w, CV_8UC1);
 

samples/cpp/generic_descriptor_match.cpp

@@ -86,7 +86,7 @@ IplImage* DrawCorrespondences(IplImage* img1, const vector<KeyPoint>& features1,
 
     for (size_t i = 0; i < features2.size(); i++)
     {
-        CvPoint pt = cvPoint(features2[i].pt.x + img1->width, features2[i].pt.y);
+        CvPoint pt = cvPoint(cvRound(features2[i].pt.x + img1->width), cvRound(features2[i].pt.y));
         cvCircle(img_corr, pt, 3, CV_RGB(255, 0, 0));
         cvLine(img_corr, features1[desc_idx[i]].pt, pt, CV_RGB(0, 255, 0));
     }

samples/cpp/segment_objects.cpp

@@ -88,7 +88,7 @@ int main(int argc, char** argv)
         refineSegments(tmp_frame, bgmask, out_frame);
         imshow("video", tmp_frame);
         imshow("segmented", out_frame);
-        char keycode = waitKey(30);
+        int keycode = waitKey(30);
         if( keycode == 27 )
             break;
         if( keycode == ' ' )

samples/cpp/select3dobj.cpp

@@ -61,7 +61,7 @@ static Point3f image2plane(Point2f imgpt, const Mat& R, const Mat& tvec,
     R1.col(2) = R1.col(2)*Z + tvec;
     Mat_<double> v = (cameraMatrix*R1).inv()*(Mat_<double>(3,1) << imgpt.x, imgpt.y, 1);
     double iw = fabs(v(2,0)) > DBL_EPSILON ? 1./v(2,0) : 0;
-    return Point3f(v(0,0)*iw, v(1,0)*iw, Z);
+    return Point3f((float)(v(0,0)*iw), (float)(v(1,0)*iw), (float)Z);
 }
 
 
@@ -192,7 +192,7 @@ static int select3DBox(const string& windowname, const string& selWinName, const
                 projectPoints(Mat(tempobj), rvec, tvec, cameraMatrix, Mat(), tempimg);
                 
                 Point2f a = imgpt[nearestIdx], b = tempimg[0], d1 = b - a, d2 = m - a;
-                float n1 = norm(d1), n2 = norm(d2);
+                float n1 = (float)norm(d1), n2 = (float)norm(d2);
                 if( n1*n2 < eps )
                     imgpt[npt] = a;
                 else
@@ -458,7 +458,7 @@ int main(int argc, char** argv)
     vector<Point3f> box, boardPoints;
     
     readModelViews(indexFilename, box, capturedImgList, roiList, poseList);
-    calcChessboardCorners(boardSize, squareSize, boardPoints);
+    calcChessboardCorners(boardSize, (float)squareSize, boardPoints);
     int frameIdx = 0;
     bool grabNext = !imageList.empty();