|
|
|
@ -1,10 +1,11 @@ |
|
|
|
Index: cmake/OpenCVCompilerOptions.cmake
|
|
|
|
Index: cmake/OpenCVCompilerOptions.cmake
|
|
|
|
--- cmake/OpenCVCompilerOptions.cmake.orig 2018-11-17 11:22:17.000000000 +0100
|
|
|
|
--- cmake/OpenCVCompilerOptions.cmake.orig 2018-11-19 07:21:32.292476000 +0100
|
|
|
|
+++ cmake/OpenCVCompilerOptions.cmake 2018-11-17 20:45:46.262950000 +0100
|
|
|
|
+++ cmake/OpenCVCompilerOptions.cmake 2018-11-19 07:22:48.095203000 +0100
|
|
|
|
@@ -85,43 +85,12 @@
|
|
|
|
@@ -84,39 +84,6 @@
|
|
|
|
|
|
|
|
endif()
|
|
|
|
|
|
|
|
|
|
|
|
if(CV_GCC OR CV_CLANG)
|
|
|
|
if(CV_GCC OR CV_CLANG)
|
|
|
|
# High level of warnings.
|
|
|
|
- # High level of warnings.
|
|
|
|
- add_extra_compiler_option(-W)
|
|
|
|
- add_extra_compiler_option(-W)
|
|
|
|
- if (NOT MSVC)
|
|
|
|
- if (NOT MSVC)
|
|
|
|
- # clang-cl interprets -Wall as MSVC would: -Weverything, which is more than
|
|
|
|
- # clang-cl interprets -Wall as MSVC would: -Weverything, which is more than
|
|
|
|
@ -23,7 +24,9 @@ Index: cmake/OpenCVCompilerOptions.cmake |
|
|
|
- add_extra_compiler_option(-Wundef)
|
|
|
|
- add_extra_compiler_option(-Wundef)
|
|
|
|
- add_extra_compiler_option(-Winit-self)
|
|
|
|
- add_extra_compiler_option(-Winit-self)
|
|
|
|
- add_extra_compiler_option(-Wpointer-arith)
|
|
|
|
- add_extra_compiler_option(-Wpointer-arith)
|
|
|
|
- add_extra_compiler_option(-Wshadow)
|
|
|
|
- if(NOT (CV_GCC AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS "5.0"))
|
|
|
|
|
|
|
|
- add_extra_compiler_option(-Wshadow) # old GCC emits warnings for variables + methods combination
|
|
|
|
|
|
|
|
- endif()
|
|
|
|
- add_extra_compiler_option(-Wsign-promo)
|
|
|
|
- add_extra_compiler_option(-Wsign-promo)
|
|
|
|
- add_extra_compiler_option(-Wuninitialized)
|
|
|
|
- add_extra_compiler_option(-Wuninitialized)
|
|
|
|
- add_extra_compiler_option(-Winit-self)
|
|
|
|
- add_extra_compiler_option(-Winit-self)
|
|
|
|
@ -38,16 +41,9 @@ Index: cmake/OpenCVCompilerOptions.cmake |
|
|
|
if(ENABLE_NOISY_WARNINGS)
|
|
|
|
if(ENABLE_NOISY_WARNINGS)
|
|
|
|
add_extra_compiler_option(-Wcast-align)
|
|
|
|
add_extra_compiler_option(-Wcast-align)
|
|
|
|
add_extra_compiler_option(-Wstrict-aliasing=2)
|
|
|
|
add_extra_compiler_option(-Wstrict-aliasing=2)
|
|
|
|
else()
|
|
|
|
|
|
|
|
add_extra_compiler_option(-Wno-narrowing)
|
|
|
|
|
|
|
|
add_extra_compiler_option(-Wno-delete-non-virtual-dtor)
|
|
|
|
|
|
|
|
- add_extra_compiler_option(-Wno-unnamed-type-template-args)
|
|
|
|
|
|
|
|
add_extra_compiler_option(-Wno-comment)
|
|
|
|
|
|
|
|
if(NOT OPENCV_SKIP_IMPLICIT_FALLTHROUGH
|
|
|
|
|
|
|
|
AND NOT " ${CMAKE_CXX_FLAGS} ${OPENCV_EXTRA_FLAGS} ${OPENCV_EXTRA_CXX_FLAGS}" MATCHES "implicit-fallthrough"
|
|
|
|
|
|
|
|
Index: modules/core/src/utils/filesystem.cpp
|
|
|
|
Index: modules/core/src/utils/filesystem.cpp
|
|
|
|
--- modules/core/src/utils/filesystem.cpp.orig 2018-11-17 11:22:17.000000000 +0100
|
|
|
|
--- modules/core/src/utils/filesystem.cpp.orig 2018-11-18 10:19:28.000000000 +0100
|
|
|
|
+++ modules/core/src/utils/filesystem.cpp 2018-11-17 20:44:47.076508000 +0100
|
|
|
|
+++ modules/core/src/utils/filesystem.cpp 2018-11-19 07:21:32.292768000 +0100
|
|
|
|
@@ -34,7 +34,7 @@
|
|
|
|
@@ -34,7 +34,7 @@
|
|
|
|
#include <errno.h>
|
|
|
|
#include <errno.h>
|
|
|
|
#include <io.h>
|
|
|
|
#include <io.h>
|
|
|
|
@ -85,8 +81,8 @@ Index: modules/core/src/utils/filesystem.cpp |
|
|
|
struct FileLock::Impl
|
|
|
|
struct FileLock::Impl
|
|
|
|
{
|
|
|
|
{
|
|
|
|
Index: modules/dnn/src/torch/THGeneral.cpp
|
|
|
|
Index: modules/dnn/src/torch/THGeneral.cpp
|
|
|
|
--- modules/dnn/src/torch/THGeneral.cpp.orig 2018-11-17 11:22:17.000000000 +0100
|
|
|
|
--- modules/dnn/src/torch/THGeneral.cpp.orig 2018-11-18 10:19:28.000000000 +0100
|
|
|
|
+++ modules/dnn/src/torch/THGeneral.cpp 2018-11-17 20:44:47.076690000 +0100
|
|
|
|
+++ modules/dnn/src/torch/THGeneral.cpp 2018-11-19 07:21:32.292893000 +0100
|
|
|
|
@@ -2,7 +2,7 @@
|
|
|
|
@@ -2,7 +2,7 @@
|
|
|
|
|
|
|
|
|
|
|
|
#if defined(TH_DISABLE_HEAP_TRACKING)
|
|
|
|
#if defined(TH_DISABLE_HEAP_TRACKING)
|
|
|
|
|
