More natural sorting of MatType constants in performance reports.

2012-01-16 07:04:26 +00:00
parent 61cb83b481
commit c326de43c1
3 changed files with 12 additions and 7 deletions
--- a/modules/core/perf/perf_stat.cpp
+++ b/modules/core/perf/perf_stat.cpp
@@ -87,7 +87,7 @@ PERF_TEST_P(Size_MatType, meanStdDev_mask, TYPICAL_MATS)
    SANITY_CHECK(dev, 1e-6);
 }

-PERF_TEST_P(Size_MatType, countNonZero, TYPICAL_MATS_C1)
+PERF_TEST_P(Size_MatType, countNonZero, testing::Combine( testing::Values( TYPICAL_MAT_SIZES ), testing::Values( CV_8UC1, CV_8SC1, CV_16UC1, CV_16SC1, CV_32SC1, CV_32FC1, CV_64FC1 ) ))
 {
    Size sz = get<0>(GetParam());
    int matType = get<1>(GetParam());