From 30cdcfa55497fc97693d46d04447475194aba78d Mon Sep 17 00:00:00 2001 From: Alexander Alekhin Date: Thu, 17 Nov 2016 18:41:39 +0300 Subject: [PATCH] warnings --- 3rdparty/libtiff/CMakeLists.txt | 4 +++- 3rdparty/openexr/CMakeLists.txt | 5 +++-- modules/calib3d/src/homography_decomp.cpp | 2 +- modules/core/include/opencv2/core/hal/intrin_cpp.hpp | 4 +++- modules/highgui/src/window_gtk.cpp | 2 +- modules/superres/src/optical_flow.cpp | 4 ++++ 6 files changed, 15 insertions(+), 6 deletions(-) diff --git a/3rdparty/libtiff/CMakeLists.txt b/3rdparty/libtiff/CMakeLists.txt index 7a5b34c611..93bcf7ee6a 100644 --- a/3rdparty/libtiff/CMakeLists.txt +++ b/3rdparty/libtiff/CMakeLists.txt @@ -86,7 +86,9 @@ else() endif() ocv_warnings_disable(CMAKE_C_FLAGS -Wno-unused-but-set-variable -Wmissing-prototypes -Wmissing-declarations -Wundef -Wunused -Wsign-compare - -Wcast-align -Wshadow -Wno-maybe-uninitialized -Wno-pointer-to-int-cast -Wno-int-to-pointer-cast) + -Wcast-align -Wshadow -Wno-maybe-uninitialized -Wno-pointer-to-int-cast -Wno-int-to-pointer-cast + -Wmisleading-indentation +) ocv_warnings_disable(CMAKE_C_FLAGS -Wunused-parameter) # clang ocv_warnings_disable(CMAKE_CXX_FLAGS -Wmissing-declarations -Wunused-parameter) ocv_warnings_disable(CMAKE_CXX_FLAGS /wd4018 /wd4100 /wd4127 /wd4311 /wd4701 /wd4706) # vs2005 diff --git a/3rdparty/openexr/CMakeLists.txt b/3rdparty/openexr/CMakeLists.txt index dc1d3935f6..65d43ae71a 100644 --- a/3rdparty/openexr/CMakeLists.txt +++ b/3rdparty/openexr/CMakeLists.txt @@ -39,8 +39,9 @@ endif() source_group("Include" FILES ${lib_hdrs} ) source_group("Src" FILES ${lib_srcs}) -ocv_warnings_disable(CMAKE_CXX_FLAGS -Wshadow -Wunused -Wsign-compare -Wundef -Wmissing-declarations -Wuninitialized -Wswitch -Wparentheses -Warray-bounds -Wextra) -ocv_warnings_disable(CMAKE_CXX_FLAGS -Wdeprecated-declarations) +ocv_warnings_disable(CMAKE_CXX_FLAGS -Wshadow -Wunused -Wsign-compare -Wundef -Wmissing-declarations -Wuninitialized -Wswitch -Wparentheses -Warray-bounds -Wextra + -Wdeprecated-declarations -Wmisleading-indentation +) ocv_warnings_disable(CMAKE_CXX_FLAGS /wd4018 /wd4099 /wd4100 /wd4101 /wd4127 /wd4189 /wd4245 /wd4305 /wd4389 /wd4512 /wd4701 /wd4702 /wd4706 /wd4800) # vs2005 ocv_warnings_disable(CMAKE_CXX_FLAGS /wd4334) # vs2005 Win64 ocv_warnings_disable(CMAKE_CXX_FLAGS /wd4244) # vs2008 diff --git a/modules/calib3d/src/homography_decomp.cpp b/modules/calib3d/src/homography_decomp.cpp index 1a642612f0..9007d0a4b5 100644 --- a/modules/calib3d/src/homography_decomp.cpp +++ b/modules/calib3d/src/homography_decomp.cpp @@ -447,7 +447,7 @@ int decomposeHomographyMat(InputArray _H, Mat K = _K.getMat().reshape(1, 3); CV_Assert(K.cols == 3 && K.rows == 3); - auto_ptr hdecomp(new HomographyDecompInria); + cv::Ptr hdecomp(new HomographyDecompInria); vector motions; hdecomp->decomposeHomography(H, K, motions); diff --git a/modules/core/include/opencv2/core/hal/intrin_cpp.hpp b/modules/core/include/opencv2/core/hal/intrin_cpp.hpp index 8e8b691559..2f8d027b7e 100644 --- a/modules/core/include/opencv2/core/hal/intrin_cpp.hpp +++ b/modules/core/include/opencv2/core/hal/intrin_cpp.hpp @@ -455,8 +455,10 @@ template inline v_reg<_Tp, n> operator ~ (const v_reg<_Tp, { v_reg<_Tp, n> c; for( int i = 0; i < n; i++ ) + { c.s[i] = V_TypeTraits<_Tp>::reinterpret_from_int(~V_TypeTraits<_Tp>::reinterpret_int(a.s[i])); - return c; + } + return c; } //! @brief Helper macro diff --git a/modules/highgui/src/window_gtk.cpp b/modules/highgui/src/window_gtk.cpp index 527335e012..8ead11d6ee 100644 --- a/modules/highgui/src/window_gtk.cpp +++ b/modules/highgui/src/window_gtk.cpp @@ -1983,7 +1983,7 @@ static gboolean icvOnMouse( GtkWidget *widget, GdkEvent *event, gpointer user_da break; #endif //GTK_VERSION3_4 case GDK_SCROLL_LEFT: cv_event = CV_EVENT_MOUSEHWHEEL; - case GDK_SCROLL_UP: flags |= ((-(int)1 << 16)); + case GDK_SCROLL_UP: flags |= ~0xffff; break; case GDK_SCROLL_RIGHT: cv_event = CV_EVENT_MOUSEHWHEEL; case GDK_SCROLL_DOWN: flags |= (((int)1 << 16)); diff --git a/modules/superres/src/optical_flow.cpp b/modules/superres/src/optical_flow.cpp index b5d1407eee..89a67899b4 100644 --- a/modules/superres/src/optical_flow.cpp +++ b/modules/superres/src/optical_flow.cpp @@ -65,7 +65,9 @@ namespace virtual void impl(InputArray input0, InputArray input1, OutputArray dst) = 0; private: +#ifdef HAVE_OPENCL bool ocl_calc(InputArray frame0, InputArray frame1, OutputArray flow1, OutputArray flow2); +#endif int work_type_; @@ -85,6 +87,7 @@ namespace { } +#ifdef HAVE_OPENCL bool CpuOpticalFlow::ocl_calc(InputArray _frame0, InputArray _frame1, OutputArray _flow1, OutputArray _flow2) { UMat frame0 = arrGetUMat(_frame0, ubuf_[0]); @@ -116,6 +119,7 @@ namespace return true; } +#endif void CpuOpticalFlow::calc(InputArray _frame0, InputArray _frame1, OutputArray _flow1, OutputArray _flow2) {