Merge pull request #1088 from apacha:brisk_noDescriptors_fix

12 years ago · 894b30b34d
parent f0c7cce87a eaa29110e1
commit 894b30b34d
1 changed files with 5 additions and 1 deletions
--- a/modules/features2d/src/brisk.cpp
+++ b/modules/features2d/src/brisk.cpp
@ -525,7 +525,11 @@ BRISK::operator()( InputArray _image, InputArray _mask, vector<KeyPoint>& keypoi
  bool doOrientation=true;
  if (useProvidedKeypoints)
    doOrientation = false;
-  computeDescriptorsAndOrOrientation(_image, _mask, keypoints, _descriptors, true, doOrientation,
+
+  // If the user specified cv::noArray(), this will yield false. Otherwise it will return true.
+  bool doDescriptors = _descriptors.needed();
+
+  computeDescriptorsAndOrOrientation(_image, _mask, keypoints, _descriptors, doDescriptors, doOrientation,
                                       useProvidedKeypoints);
 }