Merge pull request #2172 from Nerei:compilation_and_warnings

11 years ago · f60f8a7346
parent e965f3d3d4 4e20e06ee7
commit f60f8a7346
2 changed files with 3 additions and 1 deletions
--- 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)|
--- 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)
    {