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