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

Merge pull request #6822 from saedrna:master

Browse Source
This commit is contained in:
Vadim Pisarevsky 2016-07-19 15:37:31 +00:00
commit b0cc495698
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
modules/features2d/src/kaze/AKAZEFeatures.cpp
View File

@ -342,14 +342,14 @@ void AKAZEFeatures::Find_Scale_Space_Extrema(std::vector<KeyPoint>& kpts)
if (is_out == false) { if (is_out == false) {
if (is_repeated == false) { if (is_repeated == false) {
point.pt.x *= ratio; point.pt.x = (float)(point.pt.x*ratio + .5*(ratio-1.0));
point.pt.y *= ratio; point.pt.y = (float)(point.pt.y*ratio + .5*(ratio-1.0));
kpts_aux.push_back(point); kpts_aux.push_back(point);
npoints++; npoints++;
} }
else { else {
point.pt.x *= ratio; point.pt.x = (float)(point.pt.x*ratio + .5*(ratio-1.0));
point.pt.y *= ratio; point.pt.y = (float)(point.pt.y*ratio + .5*(ratio-1.0));
kpts_aux[id_repeated] = point; kpts_aux[id_repeated] = point;
} }
} // if is_out } // if is_out
@ -439,8 +439,8 @@ void AKAZEFeatures::Do_Subpixel_Refinement(std::vector<KeyPoint>& kpts)
kpts[i].pt.x = x + dst(0); kpts[i].pt.x = x + dst(0);
kpts[i].pt.y = y + dst(1); kpts[i].pt.y = y + dst(1);
int power = fastpow(2, evolution_[kpts[i].class_id].octave); int power = fastpow(2, evolution_[kpts[i].class_id].octave);
kpts[i].pt.x *= power; kpts[i].pt.x = (float)(kpts[i].pt.x*power + .5*(power-1));
kpts[i].pt.y *= power; kpts[i].pt.y = (float)(kpts[i].pt.y*power + .5*(power-1));
kpts[i].angle = 0.0; kpts[i].angle = 0.0;
// In OpenCV the size of a keypoint its the diameter // In OpenCV the size of a keypoint its the diameter