aboutsummaryrefslogtreecommitdiffstats
path: root/native/jni/src/proximity_info.cpp
diff options
context:
space:
mode:
authorSatoshi Kataoka <satok@google.com>2012-09-12 23:40:48 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-09-12 23:40:48 -0700
commit6b966b2623647ebbab0e2a51f1390be93c422f2b (patch)
tree76c26c733662b6227cff7830d15f854427fedac6 /native/jni/src/proximity_info.cpp
parentcdf4135f6332d5e2bb25f6447e0d1fb735eb1976 (diff)
parentf4554d8b10f25ab300d057ff0ebd16b2b7a70be8 (diff)
downloadlatinime-6b966b2623647ebbab0e2a51f1390be93c422f2b.tar.gz
latinime-6b966b2623647ebbab0e2a51f1390be93c422f2b.tar.xz
latinime-6b966b2623647ebbab0e2a51f1390be93c422f2b.zip
am f4554d8b: Fix an issue on FP calculation diff of osx and linux
* commit 'f4554d8b10f25ab300d057ff0ebd16b2b7a70be8': Fix an issue on FP calculation diff of osx and linux
Diffstat (limited to 'native/jni/src/proximity_info.cpp')
-rw-r--r--native/jni/src/proximity_info.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/native/jni/src/proximity_info.cpp b/native/jni/src/proximity_info.cpp
index 9bb8b29ae..693a9f2b1 100644
--- a/native/jni/src/proximity_info.cpp
+++ b/native/jni/src/proximity_info.cpp
@@ -141,7 +141,9 @@ bool ProximityInfo::hasSpaceProximity(const int x, const int y) const {
static inline float getNormalizedSquaredDistanceFloat(float x1, float y1, float x2, float y2,
float scale) {
- return squareFloat((x1 - x2) / scale) + squareFloat((y1 - y2) / scale);
+ const float deltaX = x1 - x2;
+ const float deltaY = y1 - y2;
+ return (SQUARE_FLOAT(deltaX) + SQUARE_FLOAT(deltaY)) / SQUARE_FLOAT(scale);
}
float ProximityInfo::getNormalizedSquaredDistanceFromCenterFloat(