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

Merge pull request #1185 from znah:cumpute_method_for_2_4

Browse Source
This commit is contained in:
Andrey Pavlenko 2013-07-30 15:46:47 +04:00 committed by OpenCV Buildbot
commit ea6002ebc7
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/features2d.hpp
View File

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

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

@ -106,6 +106,12 @@ Ptr<DescriptorExtractor> DescriptorExtractor::create(const string& descriptorExt
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);
}
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
/****************************************************************************************\