Merge pull request #1088 from apacha:brisk_noDescriptors_fix

894b30b3 · Roman Donchenko · OpenCV Buildbot · f0c7cce8 · eaa29110 · 894b30b3
Commit 894b30b3 authored Jul 10, 2013 by Roman Donchenko Committed by OpenCV Buildbot Jul 10, 2013
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

brisk.cpp modules/features2d/src/brisk.cpp +5 -1

No files found.
--- 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);
 }