From 57bd4851191c3dd30bf17bf4c340bafd28222092 Mon Sep 17 00:00:00 2001 From: Alexander Mordvintsev Date: Thu, 25 Jul 2013 16:22:31 +0400 Subject: [PATCH] compute method for Feature2D --- modules/features2d/include/opencv2/features2d/features2d.hpp | 2 ++ modules/features2d/src/descriptors.cpp | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/modules/features2d/include/opencv2/features2d/features2d.hpp b/modules/features2d/include/opencv2/features2d/features2d.hpp index c1967f8..d4649ba 100644 --- a/modules/features2d/include/opencv2/features2d/features2d.hpp +++ b/modules/features2d/include/opencv2/features2d/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& keypoints, CV_OUT Mat& descriptors ) const; + // Create feature detector and descriptor extractor by name. CV_WRAP static Ptr create( const string& name ); }; diff --git a/modules/features2d/src/descriptors.cpp b/modules/features2d/src/descriptors.cpp index 06efe97..c9e87c2 100644 --- a/modules/features2d/src/descriptors.cpp +++ b/modules/features2d/src/descriptors.cpp @@ -106,6 +106,12 @@ Ptr DescriptorExtractor::create(const string& descriptorExt return Algorithm::create("Feature2D." + descriptorExtractorType); } + +CV_WRAP void Feature2D::compute( const Mat& image, CV_OUT CV_IN_OUT std::vector& keypoints, CV_OUT Mat& descriptors ) const +{ + DescriptorExtractor::compute(image, keypoints, descriptors); +} + ///////////////////////////////////////////////////////////////////////////////////////////////////////////////// /****************************************************************************************\ -- 2.7.4