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

gcc6: fix misleading indentation warning

Browse Source 
cosmetic changes to fix this warning.
real bugs not found
This commit is contained in:
Krishnaraj Bhat
2016-03-07 17:06:16 +05:30
parent 9ebbfc7bdb
commit 9b8013d193
7 changed files with 37 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8097,19 +8097,19 @@ void AGAST(InputArray _img, std::vector<KeyPoint>& keypoints, int threshold, boo
&& (kpts[lastRowCorner_ind].pt.y == lastRow) )
lastRowCorner_ind++;
if( (kpts[lastRowCorner_ind].pt.x == currCorner->pt.x)
&& (lastRowCorner_ind != curr_idx) )
{
size_t w = lastRowCorner_ind;
// find the maximum in this block
while(nmsFlags[w] != -1)
w = nmsFlags[w];
if( (kpts[lastRowCorner_ind].pt.x == currCorner->pt.x)
&& (lastRowCorner_ind != curr_idx) )
{
size_t w = lastRowCorner_ind;
// find the maximum in this block
while(nmsFlags[w] != -1)
w = nmsFlags[w];
if(kpts[curr_idx].response < kpts[w].response)
nmsFlags[curr_idx] = (int)w;
else
nmsFlags[w] = (int)curr_idx;
}
if(kpts[curr_idx].response < kpts[w].response)
nmsFlags[curr_idx] = (int)w;
else
nmsFlags[w] = (int)curr_idx;
}
}
// check left