From 4d510be2c95a95fa325c2452ea03f7346d66b4b8 Mon Sep 17 00:00:00 2001
From: Alexander Mordvintsev <Alexander.Mordvintsev@transas.com>
Date: Sat, 23 Mar 2013 14:06:33 +0400
Subject: [PATCH] added compute function to Feature2D (dirty workaround for
 #2699)

---
 modules/features2d/include/opencv2/features2d.hpp | 2 ++
 modules/features2d/src/descriptors.cpp            | 6 ++++++
 2 files changed, 8 insertions(+)

diff --git a/modules/features2d/include/opencv2/features2d.hpp b/modules/features2d/include/opencv2/features2d.hpp
index 8f32445ca2..1104c0b813 100644
--- a/modules/features2d/include/opencv2/features2d.hpp
+++ b/modules/features2d/include/opencv2/features2d.hpp
@@ -263,6 +263,8 @@ public:
                                      OutputArray descriptors,
                                      bool useProvidedKeypoints=false ) const = 0;
 
+    CV_WRAP void compute( const Mat& image, CV_OUT CV_IN_OUT std::vector<KeyPoint>& keypoints, CV_OUT Mat& descriptors ) const;
+
     // Create feature detector and descriptor extractor by name.
     CV_WRAP static Ptr<Feature2D> create( const std::string& name );
 };
diff --git a/modules/features2d/src/descriptors.cpp b/modules/features2d/src/descriptors.cpp
index 7f87bd5eba..34754cb45e 100644
--- a/modules/features2d/src/descriptors.cpp
+++ b/modules/features2d/src/descriptors.cpp
@@ -104,6 +104,12 @@ Ptr<DescriptorExtractor> DescriptorExtractor::create(const std::string& descript
     return Algorithm::create<DescriptorExtractor>("Feature2D." + descriptorExtractorType);
 }
 
+
+CV_WRAP void Feature2D::compute( const Mat& image, CV_OUT CV_IN_OUT std::vector<KeyPoint>& keypoints, CV_OUT Mat& descriptors ) const
+{
+   DescriptorExtractor::compute(image, keypoints, descriptors);
+}
+
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 /****************************************************************************************\