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

Merge remote-tracking branch 'upstream/master' into brisk

Browse Source
This commit is contained in:
cbalint13
2015-04-28 06:48:52 +03:00
parent dee3a4b528 6a5f413f27
commit 0ded2984b8
86 changed files with 6743 additions and 2579 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -812,7 +812,7 @@ void AKAZEFeatures::Compute_Main_Orientation(KeyPoint& kpt, const std::vector<TE
}
}
}
fastAtan2(resY, resX, Ang, ang_size, false);
hal::fastAtan2(resY, resX, Ang, ang_size, false);
// Loop slides pi/3 window around feature point
for (ang1 = 0; ang1 < (float)(2.0 * CV_PI); ang1 += 0.15f) {
ang2 = (ang1 + (float)(CV_PI / 3.0) >(float)(2.0*CV_PI) ? ang1 - (float)(5.0*CV_PI / 3.0) : ang1 + (float)(CV_PI / 3.0));