generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request from apacha:brisk_noDescriptors_fix

Browse Source
This commit is contained in:
Roman Donchenko 2013-07-10 18:18:31 +04:00 committed by OpenCV Buildbot
commit 894b30b34d
1 changed files with 5 additions and 1 deletions

6
modules/features2d/src/brisk.cpp

@ -525,7 +525,11 @@ BRISK::operator()( InputArray _image, InputArray _mask, vector<KeyPoint>& keypoi
bool doOrientation=true; bool doOrientation=true;
if (useProvidedKeypoints) if (useProvidedKeypoints)
doOrientation = false; 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); useProvidedKeypoints);
} }