generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Alexander Mordvintsev 2013-03-23 14:06:33 +04:00
parent ec15d6f383
commit 4d510be2c9
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/features2d/include/opencv2/features2d.hpp
View File

@ -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 );
}; };

6
modules/features2d/src/descriptors.cpp
View File

@ -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);
}
///////////////////////////////////////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
/****************************************************************************************\ /****************************************************************************************\