From: Alexander Pacha <alexander.pacha@gmail.com>
Date: Thu, 4 Jul 2013 04:36:29 +0000 (+1200)
Subject: Fixed issue 3130 (http://code.opencv.org/issues/3130), where one argument of the... 
X-Git-Tag: accepted/tizen/ivi/20140515.103456~1^2~657^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=eaa29110e1620aea589b7953e9d29d66a902a2ea;p=profile%2Fivi%2Fopencv.git

Fixed issue 3130 (code.opencv.org/issues/3130), where one argument of the BRISK-call was ignored. Previously it was not possible to use BRISK without creating descriptors.
Now it behaves like ORB (and how it is documented), and you can call BRISK to just generate feature points and no descriptors.
---

diff --git a/modules/features2d/src/brisk.cpp b/modules/features2d/src/brisk.cpp
index d1fa0c9..622f772 100644
--- 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);
 }