You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
55 lines
2.1 KiB
55 lines
2.1 KiB
Index: cmake/OpenCVCompilerOptions.cmake |
|
--- cmake/OpenCVCompilerOptions.cmake.orig 2018-12-22 08:03:30.000000000 +0100 |
|
+++ cmake/OpenCVCompilerOptions.cmake 2018-12-29 10:13:20.145291000 +0100 |
|
@@ -84,39 +84,6 @@ |
|
endif() |
|
|
|
if(CV_GCC OR CV_CLANG) |
|
- # High level of warnings. |
|
- add_extra_compiler_option(-W) |
|
- if (NOT MSVC) |
|
- # clang-cl interprets -Wall as MSVC would: -Weverything, which is more than |
|
- # we want. |
|
- add_extra_compiler_option(-Wall) |
|
- endif() |
|
- add_extra_compiler_option(-Werror=return-type) |
|
- add_extra_compiler_option(-Werror=non-virtual-dtor) |
|
- add_extra_compiler_option(-Werror=address) |
|
- add_extra_compiler_option(-Werror=sequence-point) |
|
- add_extra_compiler_option(-Wformat) |
|
- add_extra_compiler_option(-Werror=format-security -Wformat) |
|
- add_extra_compiler_option(-Wmissing-declarations) |
|
- add_extra_compiler_option(-Wmissing-prototypes) |
|
- add_extra_compiler_option(-Wstrict-prototypes) |
|
- add_extra_compiler_option(-Wundef) |
|
- add_extra_compiler_option(-Winit-self) |
|
- add_extra_compiler_option(-Wpointer-arith) |
|
- 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(-Wuninitialized) |
|
- add_extra_compiler_option(-Winit-self) |
|
- if(HAVE_CXX11) |
|
- if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" AND NOT ENABLE_PRECOMPILED_HEADERS) |
|
- add_extra_compiler_option(-Wsuggest-override) |
|
- elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Clang") |
|
- add_extra_compiler_option(-Winconsistent-missing-override) |
|
- endif() |
|
- endif() |
|
- |
|
if(ENABLE_NOISY_WARNINGS) |
|
add_extra_compiler_option(-Wcast-align) |
|
add_extra_compiler_option(-Wstrict-aliasing=2) |
|
Index: modules/dnn/src/torch/THGeneral.cpp |
|
--- modules/dnn/src/torch/THGeneral.cpp.orig 2018-12-22 08:03:30.000000000 +0100 |
|
+++ modules/dnn/src/torch/THGeneral.cpp 2018-12-29 10:13:23.859370000 +0100 |
|
@@ -2,7 +2,7 @@ |
|
|
|
#if defined(TH_DISABLE_HEAP_TRACKING) |
|
#elif (defined(__unix) || defined(_WIN32)) |
|
-#include <malloc.h> |
|
+#include <stdlib.h> |
|
#elif defined(__APPLE__) |
|
#include <malloc/malloc.h> |
|
#endif
|
|
|