Fix Windows build warnings

modules/calib3d/test/test_modelest.cpp

@@ -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_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
                         if (fabs(tangentVector_1.cross(tangentVector_2)) < eps)
                         {

modules/ts/src/ts.cpp

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