akaze: getAngle() -> fastAtan2()

alalek · alalek · commit f6ceeaa2e5e5 · 2017-08-03T19:51:46.000+03:00
diff --git a/modules/features2d/src/kaze/KAZEFeatures.cpp b/modules/features2d/src/kaze/KAZEFeatures.cpp
@@ -606,7 +606,7 @@ void KAZEFeatures::Compute_Main_Orientation(KeyPoint &kpt, const std::vector<TEv
                     resY[idx] = 0.0;
                 }
 
-                Ang[idx] = getAngle(resX[idx], resY[idx]);
+                Ang[idx] = fastAtan2(resX[idx], resY[idx]) * (float)(CV_PI / 180.0f);
                 ++idx;
             }
         }
@@ -638,7 +638,7 @@ void KAZEFeatures::Compute_Main_Orientation(KeyPoint &kpt, const std::vector<TEv
         if (sumX*sumX + sumY*sumY > max) {
             // store largest orientation
             max = sumX*sumX + sumY*sumY;
-            kpt.angle = getAngle(sumX, sumY) * 180.f / static_cast<float>(CV_PI);
+            kpt.angle = fastAtan2(sumX, sumY);
         }
     }
 }
diff --git a/modules/features2d/src/kaze/utils.h b/modules/features2d/src/kaze/utils.h
@@ -1,31 +1,6 @@
 #ifndef __OPENCV_FEATURES_2D_KAZE_UTILS_H__
 #define __OPENCV_FEATURES_2D_KAZE_UTILS_H__
 
-/* ************************************************************************* */
-/**
- * @brief This function computes the angle from the vector given by (X Y). From 0 to 2*Pi
- */
-inline float getAngle(float x, float y) {
-
-  if (x >= 0 && y >= 0) {
-    return atanf(y / x);
-  }
-
-  if (x < 0 && y >= 0) {
-    return static_cast<float>(CV_PI)-atanf(-y / x);
-  }
-
-  if (x < 0 && y < 0) {
-    return static_cast<float>(CV_PI)+atanf(y / x);
-  }
-
-  if (x >= 0 && y < 0) {
-    return static_cast<float>(2.0 * CV_PI) - atanf(-y / x);
-  }
-
-  return 0;
-}
-
 /* ************************************************************************* */
 /**
  * @brief This function computes the value of a 2D Gaussian function

Original file line number	Diff line number	Diff line change
`@@ -606,7 +606,7 @@ void KAZEFeatures::Compute_Main_Orientation(KeyPoint &kpt, const std::vector<TEv`
`606`	`606`	`resY[idx] = 0.0;`
`607`	`607`	`}`
`608`	`608`
`609`		`- Ang[idx] = getAngle(resX[idx], resY[idx]);`
	`609`	`+ Ang[idx] = fastAtan2(resX[idx], resY[idx]) * (float)(CV_PI / 180.0f);`
`610`	`610`	`++idx;`
`611`	`611`	`}`
`612`	`612`	`}`
`@@ -638,7 +638,7 @@ void KAZEFeatures::Compute_Main_Orientation(KeyPoint &kpt, const std::vector<TEv`
`638`	`638`	`if (sumXsumX + sumYsumY > max) {`
`639`	`639`	`// store largest orientation`
`640`	`640`	`max = sumXsumX + sumYsumY;`
`641`		`- kpt.angle = getAngle(sumX, sumY) * 180.f / static_cast<float>(CV_PI);`
	`641`	`+ kpt.angle = fastAtan2(sumX, sumY);`
`642`	`642`	`}`
`643`	`643`	`}`
`644`	`644`	`}`