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

Merge release 2.4.3

Browse Source
This commit is contained in:
Andrey Kamaev
2012-11-02 17:45:58 +04:00
parent 66b90d19a6 6484732509
commit 4d059e9e5b
126 changed files with 61518 additions and 51142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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

2
modules/highgui/src/window_w32.cpp
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));