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.

41 lines
1.4 KiB

10 years ago
Index: modules/imgcodecs/src/rgbe.cpp
--- modules/imgcodecs/src/rgbe.cpp.orig 2015-12-18 16:02:16.000000000 +0100
+++ modules/imgcodecs/src/rgbe.cpp 2016-01-14 08:50:11.979837326 +0100
@@ -43,9 +43,7 @@
#include "precomp.hpp"
#include "rgbe.hpp"
#include <math.h>
-#if !defined(__APPLE__)
-#include <malloc.h>
-#endif
+#include <stdlib.h>
#include <string.h>
#include <ctype.h>
9 years ago
Index: cmake/OpenCVCompilerOptions.cmake
--- cmake/OpenCVCompilerOptions.cmake.orig 2015-12-18 16:02:16.000000000 +0100
+++ cmake/OpenCVCompilerOptions.cmake 2016-12-26 21:25:58.587118000 +0100
@@ -73,22 +73,6 @@
if(CMAKE_COMPILER_IS_GNUCXX)
# High level of warnings.
- add_extra_compiler_option(-W)
- add_extra_compiler_option(-Wall)
- 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)
- add_extra_compiler_option(-Wshadow)
- add_extra_compiler_option(-Wsign-promo)
if(ENABLE_NOISY_WARNINGS)
add_extra_compiler_option(-Wcast-align)