Merge pull request #1266 from kdrobnyh:core_stat_functions

42b4d830 · Roman Donchenko · OpenCV Buildbot · 96a0afce · f4aa7ff9 · 42b4d830
展开全部隐藏空白更改
内联并排

Showing with 529 addition and 2 deletion

modules/core/perf/perf_stat.cpp modules/core/perf/perf_stat.cpp +2 -2

modules/core/src/stat.cpp modules/core/src/stat.cpp +527 -0

未找到文件。
--- a/modules/core/perf/perf_stat.cpp
+++ b/modules/core/perf/perf_stat.cpp
@@ -83,8 +83,8 @@ PERF_TEST_P(Size_MatType, meanStdDev_mask, TYPICAL_MATS)

    TEST_CYCLE() meanStdDev(src, mean, dev, mask);

-    SANITY_CHECK(mean, 1e-6);
-    SANITY_CHECK(dev, 1e-6);
+    SANITY_CHECK(mean, 1e-5);
+    SANITY_CHECK(dev, 1e-5);
 }

 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 ) ))

--- a/modules/core/src/stat.cpp
+++ b/modules/core/src/stat.cpp