Commit 4d510be2 authored by Alexander Mordvintsev's avatar Alexander Mordvintsev

added compute function to Feature2D (dirty workaround for #2699)

parent ec15d6f3
...@@ -263,6 +263,8 @@ public: ...@@ -263,6 +263,8 @@ public:
OutputArray descriptors, OutputArray descriptors,
bool useProvidedKeypoints=false ) const = 0; 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. // Create feature detector and descriptor extractor by name.
CV_WRAP static Ptr<Feature2D> create( const std::string& name ); CV_WRAP static Ptr<Feature2D> create( const std::string& name );
}; };
......
...@@ -104,6 +104,12 @@ Ptr<DescriptorExtractor> DescriptorExtractor::create(const std::string& descript ...@@ -104,6 +104,12 @@ Ptr<DescriptorExtractor> DescriptorExtractor::create(const std::string& descript
return Algorithm::create<DescriptorExtractor>("Feature2D." + descriptorExtractorType); 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);
}
///////////////////////////////////////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
/****************************************************************************************\ /****************************************************************************************\
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment