From 0fc4ac4f1f9602fcb54beaa04e42a7c1b2befcb6 Mon Sep 17 00:00:00 2001 From: Anatoly Baksheev Date: Sun, 19 Jan 2014 04:07:17 +0400 Subject: [PATCH 1/2] warnings and compilation with installed Windows 8.1 SDK --- modules/highgui/src/window_w32.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/highgui/src/window_w32.cpp b/modules/highgui/src/window_w32.cpp index 97527345a5..23aa02aad9 100644 --- a/modules/highgui/src/window_w32.cpp +++ b/modules/highgui/src/window_w32.cpp @@ -1363,7 +1363,9 @@ MainWindowProc( HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam ) break; case WM_MOUSEWHEEL: +#if defined WM_MOUSEHWHEEL case WM_MOUSEHWHEEL: +#endif if( window->on_mouse ) { int flags = (wParam & MK_LBUTTON ? CV_EVENT_FLAG_LBUTTON : 0)| From 4e20e06ee7fd7aaff8be51613daf14e6f46ede26 Mon Sep 17 00:00:00 2001 From: Anatoly Baksheev Date: Sun, 19 Jan 2014 04:07:24 +0400 Subject: [PATCH 2/2] warnings --- modules/imgproc/src/clahe.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/imgproc/src/clahe.cpp b/modules/imgproc/src/clahe.cpp index 079e635f94..82474788d5 100644 --- a/modules/imgproc/src/clahe.cpp +++ b/modules/imgproc/src/clahe.cpp @@ -88,7 +88,7 @@ namespace clahe 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) {