stereo: remove duplicated data types in parametrized testcases

sovrasov · sovrasov · commit 14d3a2efcd8c · 2017-09-18T13:50:30.000+03:00
diff --git a/modules/stereo/perf/perf_bm.cpp b/modules/stereo/perf/perf_bm.cpp
@@ -53,8 +53,8 @@ typedef perf::TestBaseWithParam<s_bm_test_t> 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
@@ -52,7 +52,7 @@ typedef perf::TestBaseWithParam<descript_params_t> 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 )
             )
             )

Original file line number	Diff line number	Diff line change
`@@ -53,8 +53,8 @@ typedef perf::TestBaseWithParam<s_bm_test_t> s_bm;`
`53`	`53`	`PERF_TEST_P( s_bm, sgm_perf,`
`54`	`54`	`testing::Combine(`
`55`	`55`	`testing::Values( cv::Size(512, 283), cv::Size(320, 240)),`
`56`		`- testing::Values( CV_8UC1,CV_8U ),`
`57`		`- testing::Values( CV_8UC1,CV_8U,CV_16S )`
	`56`	`+ testing::Values( CV_8U ),`
	`57`	`+ testing::Values( CV_8U,CV_16S )`
`58`	`58`	`)`
`59`	`59`	`)`
`60`	`60`	`{`
`@@ -80,8 +80,8 @@ PERF_TEST_P( s_bm, sgm_perf,`
`80`	`80`	`PERF_TEST_P( s_bm, bm_perf,`
`81`	`81`	`testing::Combine(`
`82`	`82`	`testing::Values( cv::Size(512, 383), cv::Size(320, 240) ),`
`83`		`- testing::Values( CV_8UC1,CV_8U ),`
`84`		`- testing::Values( CV_8UC1,CV_8U )`
	`83`	`+ testing::Values( CV_8U ),`
	`84`	`+ testing::Values( CV_8U )`
`85`	`85`	`)`
`86`	`86`	`)`
`87`	`87`	`{`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ typedef perf::TestBaseWithParam<descript_params_t> descript_params;`
`52`	`52`	`PERF_TEST_P( descript_params, census_sparse_descriptor,`
`53`	`53`	`testing::Combine(`
`54`	`54`	`testing::Values( TYPICAL_MAT_SIZES ),`
`55`		`- testing::Values( CV_8UC1,CV_8U ),`
	`55`	`+ testing::Values( CV_8U ),`
`56`	`56`	`testing::Values( CV_32SC4,CV_32S )`
`57`	`57`	`)`
`58`	`58`	`)`
`@@ -74,7 +74,7 @@ PERF_TEST_P( descript_params, census_sparse_descriptor,`
`74`	`74`	`PERF_TEST_P( descript_params, star_census_transform,`
`75`	`75`	`testing::Combine(`
`76`	`76`	`testing::Values( TYPICAL_MAT_SIZES ),`
`77`		`- testing::Values( CV_8UC1,CV_8U ),`
	`77`	`+ testing::Values( CV_8U ),`
`78`	`78`	`testing::Values( CV_32SC4,CV_32S )`
`79`	`79`	`)`
`80`	`80`	`)`
`@@ -96,7 +96,7 @@ PERF_TEST_P( descript_params, star_census_transform,`
`96`	`96`	`PERF_TEST_P( descript_params, modified_census_transform,`
`97`	`97`	`testing::Combine(`
`98`	`98`	`testing::Values( TYPICAL_MAT_SIZES ),`
`99`		`- testing::Values( CV_8UC1,CV_8U ),`
	`99`	`+ testing::Values( CV_8U ),`
`100`	`100`	`testing::Values( CV_32SC4,CV_32S )`
`101`	`101`	`)`
`102`	`102`	`)`
`@@ -120,7 +120,7 @@ PERF_TEST_P( descript_params, modified_census_transform,`
`120`	`120`	`PERF_TEST_P( descript_params, center_symetric_census,`
`121`	`121`	`testing::Combine(`
`122`	`122`	`testing::Values( TYPICAL_MAT_SIZES ),`
`123`		`- testing::Values( CV_8UC1,CV_8U ),`
	`123`	`+ testing::Values( CV_8U ),`
`124`	`124`	`testing::Values( CV_32SC4,CV_32S )`
`125`	`125`	`)`
`126`	`126`	`)`