Android NDK r9 support. x64 NDK support fix for MacOS X.

This commit is contained in:
Alexander Smorkalov
2013-10-01 12:58:39 +04:00
parent 4ce0a8a822
commit ccb48ddee0
6 changed files with 42 additions and 3 deletions

View File

@@ -1380,6 +1380,10 @@ CV_FitLineTest::CV_FitLineTest()
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 )
{
@@ -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 )
{
@@ -1477,6 +1484,10 @@ void CV_FitLineTest::run_func()
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 )
{
@@ -1556,6 +1567,9 @@ _exit_:
return code;
}
#if (__GNUC__ == 4) && (__GNUC_MINOR__ == 8)
# pragma GCC diagnostic pop
#endif
/****************************************************************************************\
* ContourMoments Test *