generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed some more MSVC2010 warnings

Browse Source
This commit is contained in:
Vadim Pisarevsky 2010-07-17 10:35:17 +00:00
parent ad66d33e81
commit 08cba33f9d
13 changed files with 43 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/calib3d/include/opencv2/calib3d/compat_c.h
View File

@ -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
}

9
modules/imgproc/include/opencv2/imgproc/compat_c.h
View File

@ -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

4
samples/c/fback.cpp
View File

@ -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);

8
samples/c/find_obj_calonder.cpp
View File

@ -1,5 +1,7 @@
//Calonder descriptor sample
#include <stdio.h>
#if 0
#include <cxcore.h>
#include <cv.h>
#include <cvaux.h>
@ -84,13 +86,14 @@ float CalcAffineReprojectionError(const vector<CvPoint>& p1, const vector<CvPoin
return error;
}
#endif
int main( int argc, char** argv )
int main( int, char** )
{
printf("calonder_sample is under construction\n");
return 0;
#if 0
IplImage* test_image;
IplImage* train_image;
if (argc < 3)
@ -302,4 +305,5 @@ int main( int argc, char** argv )
cvReleaseImage(&test_image);
return 0;
#endif
}

2
samples/c/grabcut.cpp
View File

@ -149,7 +149,7 @@ void GCApplication::setLblsInMask( int flags, Point p, bool isPr )
}
}
void GCApplication::mouseClick( int event, int x, int y, int flags, void* param )
void GCApplication::mouseClick( int event, int x, int y, int flags, void* )
{
// TODO add bad args check
switch( event )

2
samples/c/watershed.cpp
View File

@ -14,7 +14,7 @@ IplImage* markers = 0;
IplImage* img0 = 0, *img = 0, *img_gray = 0, *wshed = 0;
CvPoint prev_pt = {-1,-1};
void on_mouse( int event, int x, int y, int flags, void* param )
void on_mouse( int event, int x, int y, int flags, void* )
{
if( !img )
return;

5
samples/cpp/calibration.cpp
View File

@ -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);

4
samples/cpp/contours2.cpp
View File

@ -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);

2
samples/cpp/generic_descriptor_match.cpp
View File

@ -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));
}

2
samples/cpp/segment_objects.cpp
View File

@ -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 == ' ' )

6
samples/cpp/select3dobj.cpp
View File

@ -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();

4
tests/cv/src/adetectordescriptor_evaluation.cpp
View File

@ -1500,10 +1500,8 @@ void OneWayDescriptorQualityTest::processRunParamsFile ()
int poseCount = fn["poseCount"];
if (trainImagesList.length () == 0 )
{
return;
fs.release ();
}
fs.release ();
readAllDatasetsRunParams();

11
tests/cv/src/astereomatching.cpp
View File

@ -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<float>& rms, vector<float>& 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 );