Merge pull request #1156 from StevenPuttemans:bugfix_1873_new

12 years ago · cdcb5ed134
parent 1c35f121bb 52bfa7b850
commit cdcb5ed134
1 changed files with 6 additions and 1 deletions
--- a/modules/features2d/src/bagofwords.cpp
+++ b/modules/features2d/src/bagofwords.cpp
@ -149,7 +149,7 @@ void BOWImgDescriptorExtractor::compute( const Mat& image, vector<KeyPoint>& key
    int clusterCount = descriptorSize(); // = vocabulary.rows

    // Compute descriptors for the image.
-    Mat descriptors = _descriptors ? *_descriptors : Mat();
+    Mat descriptors;
    dextractor->compute( image, keypoints, descriptors );

    // Match keypoint descriptors to cluster center (to vocabulary)
@ -178,6 +178,11 @@ void BOWImgDescriptorExtractor::compute( const Mat& image, vector<KeyPoint>& key

    // Normalize image descriptor.
    imgDescriptor /= descriptors.rows;
+	
+    // Add the descriptors of image keypoints
+    if (_descriptors) {
+        *_descriptors = descriptors.clone(); 
+    }
 }

 int BOWImgDescriptorExtractor::descriptorSize() const