Merge pull request #1536 from asmorkalov:android_ndk_r9_master
This commit is contained in:
commit
cca2e5d8b1
2
3rdparty/libwebp/CMakeLists.txt
vendored
2
3rdparty/libwebp/CMakeLists.txt
vendored
@ -40,7 +40,7 @@ if(UNIX)
|
|||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
ocv_warnings_disable(CMAKE_C_FLAGS -Wunused-variable -Wshadow)
|
ocv_warnings_disable(CMAKE_C_FLAGS -Wunused-variable -Wshadow -Wmaybe-uninitialized)
|
||||||
ocv_warnings_disable(CMAKE_C_FLAGS /wd4244 /wd4267) # vs2005
|
ocv_warnings_disable(CMAKE_C_FLAGS /wd4244 /wd4267) # vs2005
|
||||||
|
|
||||||
set_target_properties(${WEBP_LIBRARY}
|
set_target_properties(${WEBP_LIBRARY}
|
||||||
|
@ -42,6 +42,10 @@
|
|||||||
|
|
||||||
#include "precomp.hpp"
|
#include "precomp.hpp"
|
||||||
|
|
||||||
|
#if (__GNUC__ == 4) && (__GNUC_MINOR__ == 8)
|
||||||
|
# pragma GCC diagnostic ignored "-Warray-bounds"
|
||||||
|
#endif
|
||||||
|
|
||||||
namespace cv
|
namespace cv
|
||||||
{
|
{
|
||||||
|
|
||||||
|
@ -1380,6 +1380,10 @@ CV_FitLineTest::CV_FitLineTest()
|
|||||||
max_noise = 0.05;
|
max_noise = 0.05;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#if (__GNUC__ == 4) && (__GNUC_MINOR__ == 8)
|
||||||
|
# pragma GCC diagnostic push
|
||||||
|
# pragma GCC diagnostic ignored "-Warray-bounds"
|
||||||
|
#endif
|
||||||
|
|
||||||
void CV_FitLineTest::generate_point_set( void* pointsSet )
|
void CV_FitLineTest::generate_point_set( void* pointsSet )
|
||||||
{
|
{
|
||||||
@ -1452,6 +1456,9 @@ void CV_FitLineTest::generate_point_set( void* pointsSet )
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#if (__GNUC__ == 4) && (__GNUC_MINOR__ == 8)
|
||||||
|
# pragma GCC diagnostic pop
|
||||||
|
#endif
|
||||||
|
|
||||||
int CV_FitLineTest::prepare_test_case( int test_case_idx )
|
int CV_FitLineTest::prepare_test_case( int test_case_idx )
|
||||||
{
|
{
|
||||||
@ -1477,6 +1484,10 @@ void CV_FitLineTest::run_func()
|
|||||||
cv::fitLine(cv::cvarrToMat(points), (cv::Vec6f&)line[0], dist_type, 0, reps, aeps);
|
cv::fitLine(cv::cvarrToMat(points), (cv::Vec6f&)line[0], dist_type, 0, reps, aeps);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#if (__GNUC__ == 4) && (__GNUC_MINOR__ == 8)
|
||||||
|
# pragma GCC diagnostic push
|
||||||
|
# pragma GCC diagnostic ignored "-Warray-bounds"
|
||||||
|
#endif
|
||||||
|
|
||||||
int CV_FitLineTest::validate_test_results( int test_case_idx )
|
int CV_FitLineTest::validate_test_results( int test_case_idx )
|
||||||
{
|
{
|
||||||
@ -1556,6 +1567,9 @@ _exit_:
|
|||||||
return code;
|
return code;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#if (__GNUC__ == 4) && (__GNUC_MINOR__ == 8)
|
||||||
|
# pragma GCC diagnostic pop
|
||||||
|
#endif
|
||||||
|
|
||||||
/****************************************************************************************\
|
/****************************************************************************************\
|
||||||
* ContourMoments Test *
|
* ContourMoments Test *
|
||||||
|
@ -413,6 +413,11 @@ CV_INLINE int _icvRemoveShadowGMM(float* data, int nD,
|
|||||||
//IEEE Trans. on Pattern Analysis and Machine Intelligence, vol.26, no.5, pages 651-656, 2004
|
//IEEE Trans. on Pattern Analysis and Machine Intelligence, vol.26, no.5, pages 651-656, 2004
|
||||||
//http://www.zoranz.net/Publications/zivkovic2004PAMI.pdf
|
//http://www.zoranz.net/Publications/zivkovic2004PAMI.pdf
|
||||||
|
|
||||||
|
#if (__GNUC__ == 4) && (__GNUC_MINOR__ == 8)
|
||||||
|
# pragma GCC diagnostic push
|
||||||
|
# pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
|
||||||
|
#endif
|
||||||
|
|
||||||
CV_INLINE int _icvUpdateGMM(float* data, int nD,
|
CV_INLINE int _icvUpdateGMM(float* data, int nD,
|
||||||
unsigned char* pModesUsed,
|
unsigned char* pModesUsed,
|
||||||
CvPBGMMGaussian* pGMM,
|
CvPBGMMGaussian* pGMM,
|
||||||
@ -601,6 +606,10 @@ CV_INLINE int _icvUpdateGMM(float* data, int nD,
|
|||||||
return bBackground;
|
return bBackground;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#if (__GNUC__ == 4) && (__GNUC_MINOR__ == 8)
|
||||||
|
# pragma GCC diagnostic pop
|
||||||
|
#endif
|
||||||
|
|
||||||
// a bit more efficient implementation for common case of 3 channel (rgb) images
|
// a bit more efficient implementation for common case of 3 channel (rgb) images
|
||||||
CV_INLINE int _icvUpdateGMM_C3(float r,float g, float b,
|
CV_INLINE int _icvUpdateGMM_C3(float r,float g, float b,
|
||||||
unsigned char* pModesUsed,
|
unsigned char* pModesUsed,
|
||||||
|
@ -162,6 +162,12 @@ icvLMedS( int *points1, int *points2, int numPoints, CvMatrix3 * fundamentalMatr
|
|||||||
|
|
||||||
/*===========================================================================*/
|
/*===========================================================================*/
|
||||||
/*===========================================================================*/
|
/*===========================================================================*/
|
||||||
|
|
||||||
|
#if (__GNUC__ == 4) && (__GNUC_MINOR__ == 8)
|
||||||
|
# pragma GCC diagnostic push
|
||||||
|
# pragma GCC diagnostic ignored "-Warray-bounds"
|
||||||
|
#endif
|
||||||
|
|
||||||
void
|
void
|
||||||
icvChoose7( int *ml, int *mr, int num, int *ml7, int *mr7 )
|
icvChoose7( int *ml, int *mr, int num, int *ml7, int *mr7 )
|
||||||
{
|
{
|
||||||
@ -322,6 +328,10 @@ icvCubic( double a2, double a1, double a0, double *squares )
|
|||||||
return CV_NO_ERR;
|
return CV_NO_ERR;
|
||||||
} /* icvCubic */
|
} /* icvCubic */
|
||||||
|
|
||||||
|
#if (__GNUC__ == 4) && (__GNUC_MINOR__ == 8)
|
||||||
|
# pragma GCC diagnostic pop
|
||||||
|
#endif
|
||||||
|
|
||||||
/*======================================================================================*/
|
/*======================================================================================*/
|
||||||
double
|
double
|
||||||
icvDet( double *M )
|
icvDet( double *M )
|
||||||
|
@ -318,7 +318,7 @@ set( CMAKE_SYSTEM_VERSION 1 )
|
|||||||
# rpath makes low sence for Android
|
# rpath makes low sence for Android
|
||||||
set( CMAKE_SKIP_RPATH TRUE CACHE BOOL "If set, runtime paths are not added when using shared libraries." )
|
set( CMAKE_SKIP_RPATH TRUE CACHE BOOL "If set, runtime paths are not added when using shared libraries." )
|
||||||
|
|
||||||
set( ANDROID_SUPPORTED_NDK_VERSIONS ${ANDROID_EXTRA_NDK_VERSIONS} -r8e -r8d -r8c -r8b -r8 -r7c -r7b -r7 -r6b -r6 -r5c -r5b -r5 "" )
|
set( ANDROID_SUPPORTED_NDK_VERSIONS ${ANDROID_EXTRA_NDK_VERSIONS} -r9 -r8e -r8d -r8c -r8b -r8 -r7c -r7b -r7 -r6b -r6 -r5c -r5b -r5 "" )
|
||||||
if(NOT DEFINED ANDROID_NDK_SEARCH_PATHS)
|
if(NOT DEFINED ANDROID_NDK_SEARCH_PATHS)
|
||||||
if( CMAKE_HOST_WIN32 )
|
if( CMAKE_HOST_WIN32 )
|
||||||
file( TO_CMAKE_PATH "$ENV{PROGRAMFILES}" ANDROID_NDK_SEARCH_PATHS )
|
file( TO_CMAKE_PATH "$ENV{PROGRAMFILES}" ANDROID_NDK_SEARCH_PATHS )
|
||||||
@ -484,7 +484,9 @@ else()
|
|||||||
message( FATAL_ERROR "Cross-compilation on your platform is not supported by this cmake toolchain" )
|
message( FATAL_ERROR "Cross-compilation on your platform is not supported by this cmake toolchain" )
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if( NOT ANDROID_NDK_HOST_X64 )
|
# CMAKE_HOST_SYSTEM_PROCESSOR on MacOS X always says i386 on Intel platform
|
||||||
|
# So we do not trust ANDROID_NDK_HOST_X64 on Apple hosts
|
||||||
|
if( NOT ANDROID_NDK_HOST_X64 AND NOT CMAKE_HOST_APPLE)
|
||||||
set( ANDROID_NDK_HOST_SYSTEM_NAME ${ANDROID_NDK_HOST_SYSTEM_NAME2} )
|
set( ANDROID_NDK_HOST_SYSTEM_NAME ${ANDROID_NDK_HOST_SYSTEM_NAME2} )
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user