diff --git a/modules/calib3d/include/opencv2/calib3d/compat_c.h b/modules/calib3d/include/opencv2/calib3d/compat_c.h index 2b2b66aa3d..650f84f0f3 100644 --- a/modules/calib3d/include/opencv2/calib3d/compat_c.h +++ b/modules/calib3d/include/opencv2/calib3d/compat_c.h @@ -49,6 +49,11 @@ extern "C" { #endif +#if !defined __cplusplus && defined _MSC_VER && _MSC_VER >= 1400 + #pragma warning(push) + #pragma warning(disable: 4100) +#endif + /* Find fundamental matrix */ CV_INLINE void cvFindFundamentalMatrix( int* points1, int* points2, int numpoints, int CV_UNREFERENCED(method), float* matrix ) @@ -270,6 +275,9 @@ CV_INLINE void cvProjectPointsSimple( int point_count, CvPoint3D64f* _object_po #define cvConvertPointsHomogenious cvConvertPointsHomogeneous +#if !defined __cplusplus && defined _MSC_VER && _MSC_VER >= 1400 + #pragma warning(pop) +#endif #ifdef __cplusplus } diff --git a/modules/imgproc/include/opencv2/imgproc/compat_c.h b/modules/imgproc/include/opencv2/imgproc/compat_c.h index 8ff57597ad..a1aed9e37d 100644 --- a/modules/imgproc/include/opencv2/imgproc/compat_c.h +++ b/modules/imgproc/include/opencv2/imgproc/compat_c.h @@ -63,6 +63,11 @@ extern "C" { #define CV_UNREFERENCED(arg) arg #endif +#if !defined __cplusplus && defined _MSC_VER && _MSC_VER >= 1400 + #pragma warning(push) + #pragma warning(disable: 4100) +#endif + typedef int CvMatType; typedef int CvDisMaskType; typedef CvMat CvMatArray; @@ -871,6 +876,10 @@ CV_INLINE void cvUnDistort( const CvArr* src, CvArr* dst, cvUnDistortOnce( src, dst, a, data.fl + 4, 1 ); } +#if !defined __cplusplus && defined _MSC_VER && _MSC_VER >= 1400 + #pragma warning(pop) +#endif + #ifdef __cplusplus } #endif diff --git a/samples/c/fback.cpp b/samples/c/fback.cpp index a6d07880bd..d89f3b637f 100644 --- a/samples/c/fback.cpp +++ b/samples/c/fback.cpp @@ -6,7 +6,7 @@ using namespace cv; void drawOptFlowMap(const Mat& flow, Mat& cflowmap, int step, - double scale, const Scalar& color) + double, const Scalar& color) { for(int y = 0; y < cflowmap.rows; y += step) for(int x = 0; x < cflowmap.cols; x += step) @@ -18,7 +18,7 @@ void drawOptFlowMap(const Mat& flow, Mat& cflowmap, int step, } } -int main(int argc, char** argv) +int main(int, char**) { VideoCapture cap(0); diff --git a/samples/c/find_obj_calonder.cpp b/samples/c/find_obj_calonder.cpp index 811f98b94b..6b138a2466 100644 --- a/samples/c/find_obj_calonder.cpp +++ b/samples/c/find_obj_calonder.cpp @@ -1,5 +1,7 @@ //Calonder descriptor sample +#include +#if 0 #include #include #include @@ -84,13 +86,14 @@ float CalcAffineReprojectionError(const vector& p1, const vector > 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); diff --git a/samples/cpp/contours2.cpp b/samples/cpp/contours2.cpp index eac5262506..640ed97453 100644 --- a/samples/cpp/contours2.cpp +++ b/samples/cpp/contours2.cpp @@ -10,7 +10,7 @@ int levels = 3; vector > contours; vector 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); diff --git a/samples/cpp/generic_descriptor_match.cpp b/samples/cpp/generic_descriptor_match.cpp index 753af734c4..eef8baa875 100644 --- a/samples/cpp/generic_descriptor_match.cpp +++ b/samples/cpp/generic_descriptor_match.cpp @@ -86,7 +86,7 @@ IplImage* DrawCorrespondences(IplImage* img1, const vector& 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)); } diff --git a/samples/cpp/segment_objects.cpp b/samples/cpp/segment_objects.cpp index 1bf3d06a83..0153892c50 100644 --- a/samples/cpp/segment_objects.cpp +++ b/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 == ' ' ) diff --git a/samples/cpp/select3dobj.cpp b/samples/cpp/select3dobj.cpp index a3463d7463..cb211e0d91 100644 --- a/samples/cpp/select3dobj.cpp +++ b/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_ v = (cameraMatrix*R1).inv()*(Mat_(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 box, boardPoints; readModelViews(indexFilename, box, capturedImgList, roiList, poseList); - calcChessboardCorners(boardSize, squareSize, boardPoints); + calcChessboardCorners(boardSize, (float)squareSize, boardPoints); int frameIdx = 0; bool grabNext = !imageList.empty(); diff --git a/tests/cv/src/adetectordescriptor_evaluation.cpp b/tests/cv/src/adetectordescriptor_evaluation.cpp index c2568431a9..987bded75d 100644 --- a/tests/cv/src/adetectordescriptor_evaluation.cpp +++ b/tests/cv/src/adetectordescriptor_evaluation.cpp @@ -1500,10 +1500,8 @@ void OneWayDescriptorQualityTest::processRunParamsFile () int poseCount = fn["poseCount"]; if (trainImagesList.length () == 0 ) - { return; - fs.release (); - } + fs.release (); readAllDatasetsRunParams(); diff --git a/tests/cv/src/astereomatching.cpp b/tests/cv/src/astereomatching.cpp index 4899f982f5..03458eeaef 100755 --- a/tests/cv/src/astereomatching.cpp +++ b/tests/cv/src/astereomatching.cpp @@ -285,8 +285,9 @@ float dispRMS( const Mat& computedDisp, const Mat& groundTruthDisp, const Mat& m Calculate fraction of bad matching pixels. */ float badMatchPxlsFraction( const Mat& computedDisp, const Mat& groundTruthDisp, const Mat& mask, - int badThresh = EVAL_BAD_THRESH ) + float _badThresh = EVAL_BAD_THRESH ) { + int badThresh = cvRound(_badThresh); checkTypeAndSizeOfDisp( groundTruthDisp, 0 ); Size sz = groundTruthDisp.size(); checkTypeAndSizeOfDisp( computedDisp, &sz ); @@ -477,10 +478,10 @@ void CV_StereoMatchingTest::run(int) ts->set_failed_test_info( code ); } -void calcErrors( const Mat& leftImg, const Mat& rightImg, +void calcErrors( const Mat& leftImg, const Mat& /*rightImg*/, const Mat& trueLeftDisp, const Mat& trueRightDisp, const Mat& trueLeftUnknDispMask, const Mat& trueRightUnknDispMask, - const Mat& calcLeftDisp, const Mat& calcRightDisp, + const Mat& calcLeftDisp, const Mat& /*calcRightDisp*/, vector& rms, vector& badPxlsFractions, const QualityEvalParams& qualityEvalParams ) { @@ -686,7 +687,7 @@ protected: } virtual int runStereoMatchingAlgorithm( const Mat& _leftImg, const Mat& _rightImg, - Mat& leftDisp, Mat& rightDisp, int caseIdx ) + Mat& leftDisp, Mat& /*rightDisp*/, int caseIdx ) { RunParams params = caseRunParams[caseIdx]; assert( params.ndisp%16 == 0 ); @@ -805,7 +806,7 @@ protected: } virtual int runStereoMatchingAlgorithm( const Mat& leftImg, const Mat& rightImg, - Mat& leftDisp, Mat& rightDisp, int caseIdx ) + Mat& leftDisp, Mat& /*rightDisp*/, int caseIdx ) { RunParams params = caseRunParams[caseIdx]; assert( params.ndisp%16 == 0 );