Merge pull request #2172 from Nerei:compilation_and_warnings

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)|

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)
     {