commit 507113a1bb0d9b7ac333512a69da12c4d5d57182
author Ken Wakasa <kwakasa@google.com> Mon Aug 13 11:36:41 2012 +0900
committer Ken Wakasa <kwakasa@google.com> Mon Aug 13 11:51:37 2012 +0900
tree 2c441ea5f1438d20c68a2e16c4de10e1b7519b8c
parent bcec82de66f52655593dc233346f11468f5077a0

Fix typo in include guard macro, and some cleanups.

Change-Id: I455f6a52667b1c6ae5eb9f58b3494dd87eb2c3f5

native/jni/src/geometry_utils.h

diff --git a/native/jni/src/geometry_utils.h b/native/jni/src/geometry_utils.h
index 65611b9..168542e 100644
--- a/native/jni/src/geometry_utils.h
+++ b/native/jni/src/geometry_utils.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef LATINIME_INCREMENTAL_GEOMETRY_UTILS_H
-#define LATINIME_INCREMENTAL_GEOMETRY_UTILS_H
+#ifndef LATINIME_GEOMETRY_UTILS_H
+#define LATINIME_GEOMETRY_UTILS_H
 
 #include <cmath>
 
@@ -49,21 +49,18 @@
 }
 
 static inline float getAngle(int x1, int y1, int x2, int y2) {
-    int dx = x1 - x2;
-    int dy = y1 - y2;
+    const int dx = x1 - x2;
+    const int dy = y1 - y2;
     if (dx == 0 && dy == 0) {
         return 0;
     }
-    float dxf = static_cast<float>(dx);
-    float dyf = static_cast<float>(dy);
+    const float dxf = static_cast<float>(dx);
+    const float dyf = static_cast<float>(dy);
     return atan2f(dyf, dxf);
 }
 
 static inline float angleDiff(float a1, float a2) {
-    float diff = a1 - a2;
-    if (diff < 0) {
-        diff = -diff;
-    }
+    const float diff = fabsf(a1 - a2);
     if (diff > M_PI_F) {
         return 2.0f * M_PI_F - diff;
     }
@@ -76,32 +73,33 @@
 //     float B = y - y1;
 //     float C = x2 - x1;
 //     float D = y2 - y1;
-//     return abs(A * D - C * B) / sqrt(C * C + D * D);
+//     return fabsf(A * D - C * B) / sqrtf(C * C + D * D);
 // }
 
 static inline float pointToLineSegDistanceSqrFloat(
         float x, float y, float x1, float y1, float x2, float y2) {
-    float ray1x = x - x1;
-    float ray1y = y - y1;
-    float ray2x = x2 - x1;
-    float ray2y = y2 - y1;
+    const float ray1x = x - x1;
+    const float ray1y = y - y1;
+    const float ray2x = x2 - x1;
+    const float ray2y = y2 - y1;
 
-    float dotProduct = ray1x * ray2x + ray1y * ray2y;
-    float lineLengthSq = ray2x * ray2x + ray2y * ray2y;
-    float projectionLengthSq = dotProduct / lineLengthSq;
+    const float dotProduct = ray1x * ray2x + ray1y * ray2y;
+    const float lineLengthSqr = sqrf(ray2x) + sqrf(ray2y);
+    const float projectionLengthSqr = dotProduct / lineLengthSqr;
 
-    float projectionX, projectionY;
-    if (projectionLengthSq < 0) {
+    float projectionX;
+    float projectionY;
+    if (projectionLengthSqr < 0.0f) {
         projectionX = x1;
         projectionY = y1;
-    } else if (projectionLengthSq > 1) {
+    } else if (projectionLengthSqr > 1.0f) {
         projectionX = x2;
         projectionY = y2;
     } else {
-        projectionX = x1 + projectionLengthSq * ray2x;
-        projectionY = y1 + projectionLengthSq * ray2y;
+        projectionX = x1 + projectionLengthSqr * ray2x;
+        projectionY = y1 + projectionLengthSqr * ray2y;
     }
     return getDistanceSqrFloat(x, y, projectionX, projectionY);
 }
 } // namespace latinime
-#endif // LATINIME_INCREMENTAL_GEOMETRY_UTILS_H
+#endif // LATINIME_GEOMETRY_UTILS_H