From 637f372f993d5d68bdb2eaa113e53e5d03073960 Mon Sep 17 00:00:00 2001 From: andreucm <acoromin@iri.upc.edu> Date: Mon, 24 Oct 2016 15:41:22 +0200 Subject: [PATCH] FeatureMatch struct removed from wolf.h and declared at feature_match.h file --- src/feature_match.h | 27 +++++++++++++++++++++++++++ src/processor_tracker_feature.h | 2 ++ src/wolf.h | 16 ++++++++-------- 3 files changed, 37 insertions(+), 8 deletions(-) create mode 100644 src/feature_match.h diff --git a/src/feature_match.h b/src/feature_match.h new file mode 100644 index 000000000..87119851d --- /dev/null +++ b/src/feature_match.h @@ -0,0 +1,27 @@ +#ifndef FEATURE_MATCH_H_ +#define FEATURE_MATCH_H_ + +// Wolf includes +#include "wolf.h" + +//wolf nampseace +namespace wolf { + +/** \brief Match between a feature and a feature + * + * Match between a feature and a feature (feature-feature correspondence) + * + **/ +struct FeatureMatch +{ + FeatureBasePtr feature_ptr_; + Scalar normalized_score_; +}; + +typedef std::map<FeatureBasePtr, FeatureMatch> FeatureMatchMap; + +}//end namespace + +#endif + + diff --git a/src/processor_tracker_feature.h b/src/processor_tracker_feature.h index 963742eaf..a4614f104 100644 --- a/src/processor_tracker_feature.h +++ b/src/processor_tracker_feature.h @@ -8,8 +8,10 @@ #ifndef PROCESSOR_TRACKER_FEATURE_H_ #define PROCESSOR_TRACKER_FEATURE_H_ +//wolf includes #include "processor_tracker.h" #include "capture_base.h" +#include "feature_match.h" #include "wolf.h" namespace wolf diff --git a/src/wolf.h b/src/wolf.h index a25a14955..08cbebbe1 100644 --- a/src/wolf.h +++ b/src/wolf.h @@ -377,14 +377,14 @@ typedef std::shared_ptr<StateQuaternion> StateQuaternionPtr; // - - Local Parametrization typedef std::shared_ptr<LocalParametrizationBase> LocalParametrizationBasePtr; -// Feature-Feature correspondence -struct FeatureMatch -{ - FeatureBasePtr feature_ptr_; - Scalar normalized_score_; -}; - -typedef std::map<FeatureBasePtr, FeatureMatch> FeatureMatchMap; +// // Feature-Feature correspondence +// struct FeatureMatch +// { +// FeatureBasePtr feature_ptr_; +// Scalar normalized_score_; +// }; +// +// typedef std::map<FeatureBasePtr, FeatureMatch> FeatureMatchMap; -- GitLab