From bbdf21679f0688af8dba88f36db3ff03963761df Mon Sep 17 00:00:00 2001 From: cbalint13 Date: Thu, 30 Apr 2015 02:23:58 +0300 Subject: [PATCH] Leave AGAST at thresold=10, cosmetic for perf tests. --- modules/features2d/include/opencv2/features2d.hpp | 2 +- modules/features2d/perf/perf_agast.cpp | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/modules/features2d/include/opencv2/features2d.hpp b/modules/features2d/include/opencv2/features2d.hpp index 1d2cd06e9e..cf95e7d343 100644 --- a/modules/features2d/include/opencv2/features2d.hpp +++ b/modules/features2d/include/opencv2/features2d.hpp @@ -445,7 +445,7 @@ public: THRESHOLD = 10000, NONMAX_SUPPRESSION = 10001, }; - CV_WRAP static Ptr create( int threshold=40, + CV_WRAP static Ptr create( int threshold=10, bool nonmaxSuppression=true, int type=AgastFeatureDetector::OAST_9_16 ); diff --git a/modules/features2d/perf/perf_agast.cpp b/modules/features2d/perf/perf_agast.cpp index dceb47e6c4..8e3e82ba84 100644 --- a/modules/features2d/perf/perf_agast.cpp +++ b/modules/features2d/perf/perf_agast.cpp @@ -6,8 +6,10 @@ using namespace perf; using std::tr1::make_tuple; using std::tr1::get; -CV_ENUM(AgastType, AgastFeatureDetector::AGAST_5_8, AgastFeatureDetector::AGAST_7_12d, - AgastFeatureDetector::AGAST_7_12s, AgastFeatureDetector::OAST_9_16) +enum { AGAST_5_8 = AgastFeatureDetector::AGAST_5_8, AGAST_7_12d = AgastFeatureDetector::AGAST_7_12d, + AGAST_7_12s = AgastFeatureDetector::AGAST_7_12s, OAST_9_16 = AgastFeatureDetector::OAST_9_16 }; +CV_ENUM(AgastType, AGAST_5_8, AGAST_7_12d, + AGAST_7_12s, OAST_9_16) typedef std::tr1::tuple File_Type_t; typedef perf::TestBaseWithParam agast;