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

Merge pull request #2174 from Nerei:yet_another_fix_for_pr2172

Browse Source
This commit is contained in:
Roman Donchenko 2014-01-20 12:06:43 +04:00 committed by OpenCV Buildbot
commit d47f32581c
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -90,6 +90,10 @@ static const char* trackbar_text =
#endif #endif
#ifndef WM_MOUSEHWHEEL
#define WM_MOUSEHWHEEL 0x020E
#endif
static 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)); assert( bmi && width >= 0 && height >= 0 && (bpp == 8 || bpp == 24 || bpp == 32));
@ -1363,9 +1367,7 @@ MainWindowProc( HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam )
break; break;
case WM_MOUSEWHEEL: case WM_MOUSEWHEEL:
#if defined WM_MOUSEHWHEEL
case WM_MOUSEHWHEEL: case WM_MOUSEHWHEEL:
#endif
if( window->on_mouse ) if( window->on_mouse )
{ {
int flags = (wParam & MK_LBUTTON ? CV_EVENT_FLAG_LBUTTON : 0)| int flags = (wParam & MK_LBUTTON ? CV_EVENT_FLAG_LBUTTON : 0)|