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

Remove windows.h include from opencv2/core/internal.hpp to avoid conflicts with TBB library.

Browse Source
This commit is contained in:
Andrey Kamaev 2012-11-01 12:44:10 +04:00
parent 7267d518d5
commit fd4909360f
6 changed files with 35 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
modules/core/include/opencv2/core/internal.hpp
View File

@ -59,16 +59,7 @@
# endif # endif
#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> # include <pthread.h>
#endif #endif

8
modules/core/src/parallel.cpp
View File

@ -42,6 +42,14 @@
#include "precomp.hpp" #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__ #if defined __linux__ || defined __APPLE__
#include <unistd.h> #include <unistd.h>
#include <stdio.h> #include <stdio.h>

10
modules/core/src/rand.cpp
View File

@ -48,8 +48,16 @@
#include "precomp.hpp" #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) #if defined __SSE2__ || (defined _M_IX86_FP && 2 == _M_IX86_FP)
#include "emmintrin.h" #include "emmintrin.h"
#endif #endif
namespace cv namespace cv

8
modules/core/src/system.cpp
View File

@ -43,6 +43,14 @@
#include "precomp.hpp" #include "precomp.hpp"
#if defined WIN32 || defined _WIN32 || defined WINCE #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> #include <tchar.h>
#if defined _MSC_VER #if defined _MSC_VER
#if _MSC_VER >= 1400 #if _MSC_VER >= 1400

13
modules/highgui/src/precomp.hpp
View File

@ -49,11 +49,6 @@
#include "opencv2/imgproc/imgproc_c.h" #include "opencv2/imgproc/imgproc_c.h"
#include "opencv2/core/internal.hpp" #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 <stdlib.h>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
@ -61,6 +56,14 @@ void FillBitmapInfo( BITMAPINFO* bmi, int width, int height, int bpp, int origi
#include <ctype.h> #include <ctype.h>
#include <assert.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 #ifdef HAVE_TEGRA_OPTIMIZATION
#include "opencv2/highgui/highgui_tegra.hpp" #include "opencv2/highgui/highgui_tegra.hpp"
#endif #endif

2
modules/highgui/src/window_w32.cpp
View File

@ -106,7 +106,7 @@ static const char* trackbar_text =
#endif #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)); assert( bmi && width >= 0 && height >= 0 && (bpp == 8 || bpp == 24 || bpp == 32));