From 14d3a2efcd8cb458826d9db0cb83365e2b655669 Mon Sep 17 00:00:00 2001 From: Vladislav Sovrasov Date: Mon, 18 Sep 2017 13:50:30 +0300 Subject: [PATCH] stereo: remove duplicated data types in parametrized testcases --- modules/stereo/perf/perf_bm.cpp | 8 ++++---- modules/stereo/perf/perf_descriptor.cpp | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/modules/stereo/perf/perf_bm.cpp b/modules/stereo/perf/perf_bm.cpp index 88aeb6a0d..84148098d 100644 --- a/modules/stereo/perf/perf_bm.cpp +++ b/modules/stereo/perf/perf_bm.cpp @@ -53,8 +53,8 @@ typedef perf::TestBaseWithParam s_bm; PERF_TEST_P( s_bm, sgm_perf, testing::Combine( testing::Values( cv::Size(512, 283), cv::Size(320, 240)), - testing::Values( CV_8UC1,CV_8U ), - testing::Values( CV_8UC1,CV_8U,CV_16S ) + testing::Values( CV_8U ), + testing::Values( CV_8U,CV_16S ) ) ) { @@ -80,8 +80,8 @@ PERF_TEST_P( s_bm, sgm_perf, PERF_TEST_P( s_bm, bm_perf, testing::Combine( testing::Values( cv::Size(512, 383), cv::Size(320, 240) ), - testing::Values( CV_8UC1,CV_8U ), - testing::Values( CV_8UC1,CV_8U ) + testing::Values( CV_8U ), + testing::Values( CV_8U ) ) ) { diff --git a/modules/stereo/perf/perf_descriptor.cpp b/modules/stereo/perf/perf_descriptor.cpp index 27d57fbd1..753517627 100644 --- a/modules/stereo/perf/perf_descriptor.cpp +++ b/modules/stereo/perf/perf_descriptor.cpp @@ -52,7 +52,7 @@ typedef perf::TestBaseWithParam descript_params; PERF_TEST_P( descript_params, census_sparse_descriptor, testing::Combine( testing::Values( TYPICAL_MAT_SIZES ), - testing::Values( CV_8UC1,CV_8U ), + testing::Values( CV_8U ), testing::Values( CV_32SC4,CV_32S ) ) ) @@ -74,7 +74,7 @@ PERF_TEST_P( descript_params, census_sparse_descriptor, PERF_TEST_P( descript_params, star_census_transform, testing::Combine( testing::Values( TYPICAL_MAT_SIZES ), - testing::Values( CV_8UC1,CV_8U ), + testing::Values( CV_8U ), testing::Values( CV_32SC4,CV_32S ) ) ) @@ -96,7 +96,7 @@ PERF_TEST_P( descript_params, star_census_transform, PERF_TEST_P( descript_params, modified_census_transform, testing::Combine( testing::Values( TYPICAL_MAT_SIZES ), - testing::Values( CV_8UC1,CV_8U ), + testing::Values( CV_8U ), testing::Values( CV_32SC4,CV_32S ) ) ) @@ -120,7 +120,7 @@ PERF_TEST_P( descript_params, modified_census_transform, PERF_TEST_P( descript_params, center_symetric_census, testing::Combine( testing::Values( TYPICAL_MAT_SIZES ), - testing::Values( CV_8UC1,CV_8U ), + testing::Values( CV_8U ), testing::Values( CV_32SC4,CV_32S ) ) )