Merge pull request #124 from branch taka-no-me:vs8-vs9-tbb

modules/core/include/opencv2/core/internal.hpp

@@ -59,16 +59,7 @@
 #  endif
 #endif
 
-#if defined WIN32 || defined WINCE
+#if !defined WIN32 && !defined WINCE
-#  ifndef _WIN32_WINNT         // This is needed for the declaration of TryEnterCriticalSection in winbase.h with Visual Studio 2005 (and older?)
-#    define _WIN32_WINNT 0x0400  // http://msdn.microsoft.com/en-us/library/ms686857(VS.85).aspx
-#  endif
-#  include <windows.h>
-#  undef small
-#  undef min
-#  undef max
-#  undef abs
-#else
 #  include <pthread.h>
 #endif
 

modules/core/src/parallel.cpp

@@ -42,6 +42,14 @@
 
 #include "precomp.hpp"
 
+#if defined WIN32 || defined WINCE
+    #include <windows.h>
+    #undef small
+    #undef min
+    #undef max
+    #undef abs
+#endif
+
 #if defined __linux__ || defined __APPLE__
     #include <unistd.h>
     #include <stdio.h>

modules/core/src/rand.cpp

@@ -48,8 +48,16 @@
 
 #include "precomp.hpp"
 
+#if defined WIN32 || defined WINCE
+    #include <windows.h>
+    #undef small
+    #undef min
+    #undef max
+    #undef abs
+#endif
+
 #if defined __SSE2__ || (defined _M_IX86_FP && 2 == _M_IX86_FP)
-#include "emmintrin.h"
+    #include "emmintrin.h"
 #endif
 
 namespace cv

modules/core/src/system.cpp

@@ -43,6 +43,14 @@
 #include "precomp.hpp"
 
 #if defined WIN32 || defined _WIN32 || defined WINCE
+#ifndef _WIN32_WINNT           // This is needed for the declaration of TryEnterCriticalSection in winbase.h with Visual Studio 2005 (and older?)
+  #define _WIN32_WINNT 0x0400  // http://msdn.microsoft.com/en-us/library/ms686857(VS.85).aspx
+#endif
+#include <windows.h>
+#undef small
+#undef min
+#undef max
+#undef abs
 #include <tchar.h>
 #if defined _MSC_VER
   #if _MSC_VER >= 1400

modules/highgui/src/precomp.hpp

@@ -49,11 +49,6 @@
 #include "opencv2/imgproc/imgproc_c.h"
 #include "opencv2/core/internal.hpp"
 
-#if defined WIN32 || defined _WIN32
-//required windows.h has to be included by the opencv2/core/internal.hpp
-void  FillBitmapInfo( BITMAPINFO* bmi, int width, int height, int bpp, int origin );
-#endif
-
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
@@ -61,6 +56,14 @@ void  FillBitmapInfo( BITMAPINFO* bmi, int width, int height, int bpp, int origi
 #include <ctype.h>
 #include <assert.h>
 
+#if defined WIN32 || defined WINCE
+    #include <windows.h>
+    #undef small
+    #undef min
+    #undef max
+    #undef abs
+#endif
+
 #ifdef HAVE_TEGRA_OPTIMIZATION
 #include "opencv2/highgui/highgui_tegra.hpp"
 #endif

modules/highgui/src/window_w32.cpp

@@ -106,7 +106,7 @@ static const char* trackbar_text =
 
 #endif
 
-void FillBitmapInfo( BITMAPINFO* bmi, int width, int height, int bpp, int origin )
+static void FillBitmapInfo( BITMAPINFO* bmi, int width, int height, int bpp, int origin )
 {
     assert( bmi && width >= 0 && height >= 0 && (bpp == 8 || bpp == 24 || bpp == 32));
 

modules/ts/include/opencv2/ts/ts_perf.hpp

@@ -478,7 +478,7 @@ CV_EXPORTS void PrintTo(const Size& sz, ::std::ostream* os);
 #define CV_PERF_TEST_MAIN(testsuitname, ...) \
 int main(int argc, char **argv)\
 {\
-    __VA_ARGS__;\
+    while (++argc >= (--argc,-1)) {__VA_ARGS__; break;} /*this ugly construction is needed for VS 2005*/\
     ::perf::Regression::Init(#testsuitname);\
     ::perf::TestBase::Init(argc, argv);\
     ::testing::InitGoogleTest(&argc, argv);\