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

Fix bugs in non-max suppression routine.

Browse Source
This commit is contained in:
cbalint13 2015-05-01 22:07:08 +03:00
parent bbdf21679f
commit 9b87c22e01
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
modules/features2d/src/agast.cpp
View File

@ -7565,19 +7565,16 @@ void AGAST(InputArray _img, std::vector<KeyPoint>& keypoints, int threshold, boo
size_t lastRowCorner_ind = 0, next_lastRowCorner_ind = 0; size_t lastRowCorner_ind = 0, next_lastRowCorner_ind = 0;
std::vector<int> nmsFlags; std::vector<int> nmsFlags;
std::vector<int>::iterator nmsFlags_p;
std::vector<KeyPoint>::iterator currCorner_nms; std::vector<KeyPoint>::iterator currCorner_nms;
std::vector<KeyPoint>::const_iterator currCorner; std::vector<KeyPoint>::const_iterator currCorner;
currCorner = keypoints.begin(); currCorner = keypoints.begin();
nmsFlags.resize((int)num_Corners); nmsFlags.resize((int)num_Corners);
nmsFlags_p = nmsFlags.begin();
// set all flags to MAXIMUM // set all flags to MAXIMUM
for(j = num_Corners; j > 0; j--) for(j = 0; j < num_Corners; j++)
*nmsFlags_p++ = -1; nmsFlags[j] = -1;
nmsFlags_p = nmsFlags.begin();
for(curr_idx = 0; curr_idx < num_Corners; curr_idx++) for(curr_idx = 0; curr_idx < num_Corners; curr_idx++)
{ {
@ -7655,11 +7652,18 @@ void AGAST(InputArray _img, std::vector<KeyPoint>& keypoints, int threshold, boo
currCorner++; currCorner++;
} }
// removing non-maximum corners // mark non-maximum corners
for(curr_idx = 0; curr_idx < num_Corners; curr_idx++) for(curr_idx = 0; curr_idx < num_Corners; curr_idx++)
{ {
if(*nmsFlags_p++ != -1) if (nmsFlags[curr_idx] != -1)
keypoints.erase(keypoints.begin() + curr_idx); keypoints[curr_idx].response = -1;
}
// erase non-maximum corners
for (j = keypoints.size(); j > 0; j--)
{
if (keypoints[j - 1].response == -1)
keypoints.erase(keypoints.begin() + j - 1 );
} }
} }
} }