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

Fix Windows build warnings

Browse Source
This commit is contained in:
Andrey Kamaev 2013-01-30 13:24:49 +04:00
parent eeb865ee8a
commit e79e81c6cd
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/calib3d/test/test_modelest.cpp
View File

@ -159,7 +159,7 @@ void CV_ModelEstimator2_Test::fill_array( int test_case_idx, int i, int j, Mat&
Point2d tangentVector_1 = arr.at<Point2d>(endPointIndex) - arr.at<Point2d>(startPointIndex); Point2d tangentVector_1 = arr.at<Point2d>(endPointIndex) - arr.at<Point2d>(startPointIndex);
Point2d tangentVector_2 = arr.at<Point2d>(testPointIndex) - arr.at<Point2d>(startPointIndex); Point2d tangentVector_2 = arr.at<Point2d>(testPointIndex) - arr.at<Point2d>(startPointIndex);
const float eps = 1e-4; const float eps = 1e-4f;
//TODO: perhaps it is better to normalize the cross product by norms of the tangent vectors //TODO: perhaps it is better to normalize the cross product by norms of the tangent vectors
if (fabs(tangentVector_1.cross(tangentVector_2)) < eps) if (fabs(tangentVector_1.cross(tangentVector_2)) < eps)
{ {

6
modules/ts/src/ts.cpp
View File

@ -47,8 +47,12 @@
#include <time.h> #include <time.h>
#if defined WIN32 || defined _WIN32 || defined WIN64 || defined _WIN64 #if defined WIN32 || defined _WIN32 || defined WIN64 || defined _WIN64
#include <io.h> #include <io.h>
#define NOMINMAX
#include <windows.h> #include <windows.h>
#undef small
#undef min
#undef max
#undef abs
#ifdef _MSC_VER #ifdef _MSC_VER
#include <eh.h> #include <eh.h>