diff options
| author |   Satoshi Kataoka <satok@google.com> | 2012-09-13 14:11:04 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2012-09-13 14:11:04 -0700 |
| commit | 877545e895f542dd0195653153a5ca260bdcf7a7 (patch) | |
| tree | 76c26c733662b6227cff7830d15f854427fedac6 /native/jni/src/proximity_info.cpp | |
| parent | d18c931e70b9f415f81d389a32d3410a9d8ac040 (diff) | |
| parent | 6b966b2623647ebbab0e2a51f1390be93c422f2b (diff) | |
| download | latinime-877545e895f542dd0195653153a5ca260bdcf7a7.tar.gz latinime-877545e895f542dd0195653153a5ca260bdcf7a7.tar.xz latinime-877545e895f542dd0195653153a5ca260bdcf7a7.zip | |
am 6b966b26: am f4554d8b: Fix an issue on FP calculation diff of osx and linux
* commit '6b966b2623647ebbab0e2a51f1390be93c422f2b':
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.cpp | 4 |
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( |