Merge pull request #371 from taka-no-me:fix_build

modules/calib3d/src/_modelest.h

@@ -43,7 +43,7 @@
 #ifndef _CV_MODEL_EST_H_
 #define _CV_MODEL_EST_H_
 
-#include "precomp.hpp"
+#include "opencv2/calib3d/calib3d.hpp"
 
 class CV_EXPORTS CvModelEstimator2
 {

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>

samples/cpp/descriptor_extractor_matcher.cpp

@@ -222,7 +222,7 @@ static void doIteration( const Mat& img1, Mat& img2, bool isWarpPerspective,
                      DrawMatchesFlags::DRAW_OVER_OUTIMG | DrawMatchesFlags::NOT_DRAW_SINGLE_POINTS );
 #endif
 
-        printf("Number of inliers: %d\n", countNonZero(matchesMask));
+        cout << "Number of inliers: " << countNonZero(matchesMask) << endl;
     }
     else
         drawMatches( img1, keypoints1, img2, keypoints2, filteredMatches, drawImg );

samples/cpp/videostab.cpp

+#if defined __clang__
+#  pragma GCC diagnostic ignored "-Wdelete-non-virtual-dtor"
+#endif
+
 #include <string>
 #include <iostream>
 #include <fstream>