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

removed unnecessary #include "windows.h" from "highgui_c.h"

Browse Source
This commit is contained in:
Vadim Pisarevsky 2011-05-13 19:40:57 +00:00
parent 9d787afe72
commit 5199cd9c95
3 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
modules/highgui/include/opencv2/highgui/highgui_c.h
View File

@ -43,11 +43,6 @@
#define __OPENCV_HIGHGUI_H__ #define __OPENCV_HIGHGUI_H__
#include "opencv2/core/core_c.h" #include "opencv2/core/core_c.h"
#if defined WIN32 || defined _WIN32
#include <windows.h>
#undef min
#undef max
#endif
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
@ -462,9 +457,10 @@ CVAPI(void) cvReleaseVideoWriter( CvVideoWriter** writer );
#if defined WIN32 || defined _WIN32 #if defined WIN32 || defined _WIN32
typedef int (CV_CDECL * CvWin32WindowCallback)(HWND, UINT, WPARAM, LPARAM, int*); CVAPI(void) cvSetPreprocessFuncWin32_(const void* callback);
CVAPI(void) cvSetPreprocessFuncWin32( CvWin32WindowCallback on_preprocess ); CVAPI(void) cvSetPostprocessFuncWin32_(const void* callback);
CVAPI(void) cvSetPostprocessFuncWin32( CvWin32WindowCallback on_postprocess ); #define cvSetPreprocessFuncWin32(callback) cvSetPreprocessFuncWin32_((const void*)(callback))
#define cvSetPostprocessFuncWin32(callback) cvSetPostprocessFuncWin32_((const void*)(callback))
#endif #endif

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

@ -60,6 +60,12 @@
#include "cvconfig.h" #include "cvconfig.h"
#if defined WIN32 || defined _WIN32 #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 ); void FillBitmapInfo( BITMAPINFO* bmi, int width, int height, int bpp, int origin );
#endif #endif

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

@ -1671,23 +1671,18 @@ CV_IMPL const char* cvGetWindowName( void* window_handle )
} }
typedef int (CV_CDECL * CvWin32WindowCallback)(HWND, UINT, WPARAM, LPARAM, int*);
CV_IMPL void CV_IMPL void
cvSetPreprocessFuncWin32(int (__cdecl *on_preprocess)(HWND, UINT, WPARAM, LPARAM, int*)) cvSetPreprocessFuncWin32_(const void* callback)
{ {
if(on_preprocess) hg_on_preprocess = (CvWin32WindowCallback)callback;
hg_on_preprocess = on_preprocess;
else
assert(on_preprocess);
} }
CV_IMPL void CV_IMPL void
cvSetPostprocessFuncWin32(int (__cdecl *on_postprocess)(HWND, UINT, WPARAM, LPARAM, int*)) cvSetPostprocessFuncWin32_(const void* callback)
{ {
if(on_postprocess) hg_on_postprocess = (CvWin32WindowCallback)callback;
hg_on_postprocess = on_postprocess;
else
assert(on_postprocess);
} }
#endif //WIN32 #endif //WIN32