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

Merge pull request #1290 from mbarnach:bow_desc

Browse Source
This commit is contained in:
Andrey Pavlenko
2014-01-21 19:22:46 +04:00
committed by OpenCV Buildbot
parent 9eca3ec8f6 fb9c59dd8d
commit 4fbd2ef87a
3 changed files with 43 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1512,12 +1512,15 @@ class CV_EXPORTS BOWImgDescriptorExtractor
public:
BOWImgDescriptorExtractor( const Ptr<DescriptorExtractor>& dextractor,
const Ptr<DescriptorMatcher>& dmatcher );
BOWImgDescriptorExtractor( const Ptr<DescriptorMatcher>& dmatcher );
virtual ~BOWImgDescriptorExtractor();
void setVocabulary( const Mat& vocabulary );
const Mat& getVocabulary() const;
void compute( const Mat& image, std::vector<KeyPoint>& keypoints, Mat& imgDescriptor,
std::vector<std::vector<int> >* pointIdxsOfClusters=0, Mat* descriptors=0 );
void compute( const Mat& keypointDescriptors, Mat& imgDescriptor,
std::vector<std::vector<int> >* pointIdxsOfClusters=0 );
// compute() is not constant because DescriptorMatcher::match is not constant
int descriptorSize() const;