From b8adc04545b3fc0c8c24433b660c7ada75bea2fa Mon Sep 17 00:00:00 2001 From: Andrey Kamaev Date: Thu, 6 Sep 2012 14:43:08 +0400 Subject: [PATCH] Fix Android build warnings --- 3rdparty/openexr/CMakeLists.txt | 2 +- modules/features2d/src/brisk.cpp | 2 +- modules/ts/include/opencv2/ts/ts.hpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/3rdparty/openexr/CMakeLists.txt b/3rdparty/openexr/CMakeLists.txt index ea8c79e..a77a6e1 100644 --- a/3rdparty/openexr/CMakeLists.txt +++ b/3rdparty/openexr/CMakeLists.txt @@ -37,7 +37,7 @@ 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) +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 /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/features2d/src/brisk.cpp b/modules/features2d/src/brisk.cpp index 2a54d7c..066817c 100755 --- a/modules/features2d/src/brisk.cpp +++ b/modules/features2d/src/brisk.cpp @@ -1182,7 +1182,7 @@ BriskScaleSpace::refine3D(const int layer, const int x_layer, const int y_layer, const int center = thisLayer.getAgastScore(x_layer, y_layer, 1); // check and get above maximum: - float delta_x_above, delta_y_above; + float delta_x_above = 0, delta_y_above = 0; float max_above = getScoreMaxAbove(layer, x_layer, y_layer, center, ismax, delta_x_above, delta_y_above); if (!ismax) diff --git a/modules/ts/include/opencv2/ts/ts.hpp b/modules/ts/include/opencv2/ts/ts.hpp index b51bfb7..bf6e7e9 100644 --- a/modules/ts/include/opencv2/ts/ts.hpp +++ b/modules/ts/include/opencv2/ts/ts.hpp @@ -12,7 +12,7 @@ #ifdef ANDROID # include -# define GTEST_HAS_CLONE (__ANDROID_API__ > 7 && __arm__) +# define GTEST_HAS_CLONE (__ANDROID_API__ > 7 && !defined __i386__) # define GTEST_HAS_POSIX_RE (__ANDROID_API__ > 7) # if defined _GLIBCXX_USE_WCHAR_T && _GLIBCXX_USE_WCHAR_T # define GTEST_HAS_STD_WSTRING 1 -- 2.7.4