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

Merge pull request #2172 from Nerei:compilation_and_warnings

Browse Source
This commit is contained in:
Andrey Pavlenko 2014-01-19 11:44:36 +04:00 committed by OpenCV Buildbot
commit f60f8a7346
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1363,7 +1363,9 @@ 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)|

2
modules/imgproc/src/clahe.cpp
View File

@ -88,7 +88,7 @@ namespace clahe
return true; return true;
} }
static bool transform(const cv::InputArray _src, cv::OutputArray _dst, const cv::InputArray _lut, static bool transform(cv::InputArray _src, cv::OutputArray _dst, cv::InputArray _lut,
const int tilesX, const int tilesY, const cv::Size & tileSize) const int tilesX, const int tilesY, const cv::Size & tileSize)
{ {