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

Forbid incorrect patchSize values in ORB

Browse Source
This commit is contained in:
Andrey Kamaev 2012-08-15 16:50:02 +04:00
parent b0927397e9
commit 859ee6087c
1 changed files with 4 additions and 2 deletions

6
modules/features2d/src/orb.cpp

@ -633,7 +633,7 @@ static void computeKeyPoints(const vector<Mat>& imagePyramid,
// pre-compute the end of a row in a circular patch // pre-compute the end of a row in a circular patch
int halfPatchSize = patchSize / 2; int halfPatchSize = patchSize / 2;
vector<int> umax(halfPatchSize + 1); vector<int> umax(halfPatchSize + 2);
int v, v0, vmax = cvFloor(halfPatchSize * sqrt(2.f) / 2 + 1); int v, v0, vmax = cvFloor(halfPatchSize * sqrt(2.f) / 2 + 1);
int vmin = cvCeil(halfPatchSize * sqrt(2.f) / 2); int vmin = cvCeil(halfPatchSize * sqrt(2.f) / 2);
@ -643,7 +643,7 @@ static void computeKeyPoints(const vector<Mat>& imagePyramid,
// Make sure we are symmetric // Make sure we are symmetric
for (v = halfPatchSize, v0 = 0; v >= vmin; --v) for (v = halfPatchSize, v0 = 0; v >= vmin; --v)
{ {
while (umax[v0] == umax[v0 + 1]) while (umax[v0] == umax[v0 + 1])
++v0; ++v0;
umax[v] = v0; umax[v] = v0;
++v0; ++v0;
@ -723,6 +723,8 @@ static void computeDescriptors(const Mat& image, vector<KeyPoint>& keypoints, Ma
void ORB::operator()( InputArray _image, InputArray _mask, vector<KeyPoint>& _keypoints, void ORB::operator()( InputArray _image, InputArray _mask, vector<KeyPoint>& _keypoints,
OutputArray _descriptors, bool useProvidedKeypoints) const OutputArray _descriptors, bool useProvidedKeypoints) const
{ {
CV_Assert(patchSize >= 2);
bool do_keypoints = !useProvidedKeypoints; bool do_keypoints = !useProvidedKeypoints;
bool do_descriptors = _descriptors.needed(); bool do_descriptors = _descriptors.needed();