aboutsummaryrefslogtreecommitdiffstats
path: root/meowpp/gra/FeaturePointsMatch.h
diff options
context:
space:
mode:
Diffstat (limited to 'meowpp/gra/FeaturePointsMatch.h')
-rw-r--r--meowpp/gra/FeaturePointsMatch.h25
1 files changed, 4 insertions, 21 deletions
diff --git a/meowpp/gra/FeaturePointsMatch.h b/meowpp/gra/FeaturePointsMatch.h
index 8b05632..ffdbe53 100644
--- a/meowpp/gra/FeaturePointsMatch.h
+++ b/meowpp/gra/FeaturePointsMatch.h
@@ -3,32 +3,15 @@
#include "FeaturePoint.h"
+#include "../utility.h"
#include "../oo/ObjBase.h"
-#include <utility>
#include <cstdlib>
namespace meow {
-struct FeaturePointIndexPair {
- std::pair<size_t, size_t> from;
- std::pair<size_t, size_t> to;
-
- FeaturePointIndexPair() {
- }
- FeaturePointIndexPair(size_t ff, size_t fs,
- size_t tf, size_t ts) {
- from.first = ff;
- from.second = fs;
- to.first = tf;
- to.second = ts;
- }
- bool operator==(FeaturePointIndexPair const& p) const {
- return (from == p.from && to == p.to);
- }
-};
-
-typedef std::vector<FeaturePointIndexPair> FeaturePointIndexPairs;
+typedef PairToPair<size_t, size_t, size_t, size_t> FeaturePointIndexPair ;
+typedef std::vector<FeaturePointIndexPair> FeaturePointIndexPairs;
template<class Scalar, class Description>
class FeaturePointsMatch: public ObjBase {
@@ -58,6 +41,6 @@ public:
FeaturePointss const& fpss) const = 0;
};
-}
+} // meow
#endif // gra_FeaturePointsMatch_H__