Merge pull request #1466 from egorpugin:patch-1

modules/saliency/src/BING/kyheader.hpp

@@ -65,7 +65,7 @@
 #define cvLIB(name) "opencv_" name CV_VERSION_ID
 #endif
 
-#ifdef WIN32
+#ifdef _WIN32
 /* windows stuff */
 #else
 typedef unsigned long DWORD;
@@ -78,7 +78,10 @@ typedef void *HANDLE;
 #ifndef _MSC_VER
 typedef unsigned char BYTE;
 #else
+#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
+#undef min
+#undef max
 #endif
 
 typedef std::vector<int> vecI;

modules/sfm/src/libmv_light/libmv/numeric/numeric.h

@@ -43,7 +43,7 @@ static void sincos(double x, double *sinx, double *cosx) {
 #  endif
 #endif  // !__MINGW64__
 
-#if (defined(WIN32) || defined(WIN64)) && !defined(__MINGW32__)
+#if (defined(_WIN32)) && !defined(__MINGW32__)
 inline long lround(double d) {
   return (long)(d>0 ? d+0.5 : ceil(d-0.5));
 }

modules/xfeatures2d/samples/bagofwords_classification.cpp

@@ -14,7 +14,7 @@
 #include <memory>
 #include <functional>
 
-#if defined WIN32 || defined _WIN32
+#ifdef _WIN32
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #undef min