mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-24 19:20:28 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1156 from StevenPuttemans:bugfix_1873_new

Browse Source
This commit is contained in:
Andrey Pavlenko 2013-07-21 18:46:58 +04:00 committed by OpenCV Buildbot
commit cdcb5ed134
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
modules/features2d/src/bagofwords.cpp
View File

@ -149,7 +149,7 @@ void BOWImgDescriptorExtractor::compute( const Mat& image, vector<KeyPoint>& key
int clusterCount = descriptorSize(); // = vocabulary.rows int clusterCount = descriptorSize(); // = vocabulary.rows
// Compute descriptors for the image. // Compute descriptors for the image.
Mat descriptors = _descriptors ? *_descriptors : Mat(); Mat descriptors;
dextractor->compute( image, keypoints, descriptors ); dextractor->compute( image, keypoints, descriptors );
// Match keypoint descriptors to cluster center (to vocabulary) // Match keypoint descriptors to cluster center (to vocabulary)
@ -178,6 +178,11 @@ void BOWImgDescriptorExtractor::compute( const Mat& image, vector<KeyPoint>& key
// Normalize image descriptor. // Normalize image descriptor.
imgDescriptor /= descriptors.rows; imgDescriptor /= descriptors.rows;
// Add the descriptors of image keypoints
if (_descriptors) {
*_descriptors = descriptors.clone();
}
} }
int BOWImgDescriptorExtractor::descriptorSize() const int BOWImgDescriptorExtractor::descriptorSize() const