aboutsummaryrefslogtreecommitdiffstats
path: root/native/jni/src/proximity_info_utils.h
diff options
context:
space:
mode:
authorSatoshi Kataoka <satok@google.com>2013-01-21 01:58:55 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2013-01-21 01:58:55 -0800
commit82deebe0d9d647951c95e67aef6b4b97ab6f4c52 (patch)
tree5a06bbbcaa048183dd4aba18643f16b500a7be08 /native/jni/src/proximity_info_utils.h
parent1ab8cdbe32314c17192836abae77411d628a6a86 (diff)
parent26a0c628b0723b2c6b7700eb0b3af3548cf312b7 (diff)
downloadlatinime-82deebe0d9d647951c95e67aef6b4b97ab6f4c52.tar.gz
latinime-82deebe0d9d647951c95e67aef6b4b97ab6f4c52.tar.xz
latinime-82deebe0d9d647951c95e67aef6b4b97ab6f4c52.zip
am 26a0c628: Merge "refactor proximity info"
* commit '26a0c628b0723b2c6b7700eb0b3af3548cf312b7': refactor proximity info
Diffstat (limited to '')
-rw-r--r--native/jni/src/proximity_info_utils.h5
1 files changed, 0 insertions, 5 deletions
diff --git a/native/jni/src/proximity_info_utils.h b/native/jni/src/proximity_info_utils.h
index 5adcc2ee9..09302075a 100644
--- a/native/jni/src/proximity_info_utils.h
+++ b/native/jni/src/proximity_info_utils.h
@@ -92,11 +92,6 @@ class ProximityInfoUtils {
return SQUARE_FLOAT(x1 - x2) + SQUARE_FLOAT(y1 - y2);
}
- static AK_FORCE_INLINE int getDistanceInt(const int x1, const int y1, const int x2,
- const int y2) {
- return static_cast<int>(hypotf(static_cast<float>(x1 - x2), static_cast<float>(y1 - y2)));
- }
-
static inline float pointToLineSegSquaredDistanceFloat(const float x, const float y,
const float x1, const float y1, const float x2, const float y2, const bool extend) {
const float ray1x = x - x1;