mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-25 11:40:44 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed MSCV2005 build with TBB enabled.

Browse Source
This commit is contained in:
Andrey Kamaev 2012-03-27 23:17:53 +00:00
parent 8eb788c6e7
commit 9941cf7c95
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/core/include/opencv2/core/operations.hpp
View File

@ -76,7 +76,10 @@
#endif #endif
#elif defined WIN32 || defined _WIN32 #elif defined WIN32 || defined _WIN32
#define WIN32_MEAN_AND_LEAN #define WIN32_MEAN_AND_LEAN
#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> #include <windows.h>
#undef min #undef min
#undef max #undef max

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

@ -48,21 +48,16 @@
#include "cvconfig.h" #include "cvconfig.h"
#if defined WIN32 || defined _WIN32
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#undef min
#undef max
void FillBitmapInfo( BITMAPINFO* bmi, int width, int height, int bpp, int origin );
#endif
#include "opencv2/highgui/highgui.hpp" #include "opencv2/highgui/highgui.hpp"
#include "opencv2/highgui/highgui_c.h" #include "opencv2/highgui/highgui_c.h"
#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>