potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-30 15:53:03 +04:00
Code Packages 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
Download Patch File Download Diff File Expand all files Collapse all files
modules/highgui/src/window_w32.cpp
+1 -1
View File
@@ -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));