Merge pull request #7413 from tomoaki0705:featureUniversalThreshold

994815fb · Alexander Alekhin · 994c682b · ea6410d1 · 994815fb · 994815fb
展开全部隐藏空白更改
内联并排

Showing with 437 addition and 655 deletion

modules/imgproc/perf/perf_threshold.cpp modules/imgproc/perf/perf_threshold.cpp +1 -1

modules/imgproc/src/thresh.cpp modules/imgproc/src/thresh.cpp +436 -654

未找到文件。
--- a/modules/imgproc/perf/perf_threshold.cpp
+++ b/modules/imgproc/perf/perf_threshold.cpp
@@ -14,7 +14,7 @@ typedef perf::TestBaseWithParam<Size_MatType_ThreshType_t> Size_MatType_ThreshTy
 PERF_TEST_P(Size_MatType_ThreshType, threshold,
            testing::Combine(
                testing::Values(TYPICAL_MAT_SIZES),
-                testing::Values(CV_8UC1, CV_16SC1),
+                testing::Values(CV_8UC1, CV_16SC1, CV_32FC1, CV_64FC1),
                ThreshType::all()
                )
            )

--- a/modules/imgproc/src/thresh.cpp
+++ b/modules/imgproc/src/thresh.cpp