diff --git a/modules/core/perf/perf_arithm.cpp b/modules/core/perf/perf_arithm.cpp index df580f2cce..c7f497892a 100644 --- a/modules/core/perf/perf_arithm.cpp +++ b/modules/core/perf/perf_arithm.cpp @@ -6,27 +6,10 @@ using namespace perf; using std::tr1::make_tuple; using std::tr1::get; -#define TYPICAL_MAT_SIZES_CORE_ARITHM TYPICAL_MAT_SIZES +#define TYPICAL_MAT_SIZES_CORE_ARITHM TYPICAL_MAT_SIZES #define TYPICAL_MAT_TYPES_CORE_ARITHM CV_8UC1, CV_8SC1, CV_16SC1, CV_16SC2, CV_16SC3, CV_16SC4, CV_8UC4, CV_32SC1, CV_32FC1 #define TYPICAL_MATS_CORE_ARITHM testing::Combine( testing::Values( TYPICAL_MAT_SIZES_CORE_ARITHM ), testing::Values( TYPICAL_MAT_TYPES_CORE_ARITHM ) ) -#ifdef ANDROID -PERF_TEST(convert, cvRound) -{ - double number = theRNG().uniform(-100, 100); - - int result = 0; - - TEST_CYCLE_N(1000) - { - for (int i = 0; i < 500000; ++i) - result += cvRound(number); - } - - SANITY_CHECK(result); -} -#endif - PERF_TEST_P(Size_MatType, min, TYPICAL_MATS_CORE_ARITHM) { Size sz = get<0>(GetParam());