aboutsummaryrefslogtreecommitdiffstats
path: root/native/jni/src/proximity_info.cpp
diff options
context:
space:
mode:
authorKen Wakasa <kwakasa@google.com>2013-01-20 19:48:41 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2013-01-20 19:48:41 -0800
commit9a2dffdbd14c4a481d576dfb573e5fbe977a79c0 (patch)
treed5d0a07321973a516bd87b10b94d1bb0f5a15244 /native/jni/src/proximity_info.cpp
parentc5da4e4b9681467925c698c1e5653e21936152a8 (diff)
parent0c2227ab991774768414d8ea60a469f005eb9f1a (diff)
downloadlatinime-9a2dffdbd14c4a481d576dfb573e5fbe977a79c0.tar.gz
latinime-9a2dffdbd14c4a481d576dfb573e5fbe977a79c0.tar.xz
latinime-9a2dffdbd14c4a481d576dfb573e5fbe977a79c0.zip
am 0c2227ab: Clean up in geometry_utils.h
* commit '0c2227ab991774768414d8ea60a469f005eb9f1a': Clean up in geometry_utils.h
Diffstat (limited to 'native/jni/src/proximity_info.cpp')
-rw-r--r--native/jni/src/proximity_info.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/native/jni/src/proximity_info.cpp b/native/jni/src/proximity_info.cpp
index 08646afa2..3669fd33d 100644
--- a/native/jni/src/proximity_info.cpp
+++ b/native/jni/src/proximity_info.cpp
@@ -140,7 +140,8 @@ float ProximityInfo::getNormalizedSquaredDistanceFromCenterFloatG(
const float touchX = static_cast<float>(x);
const float touchY = static_cast<float>(y);
const float keyWidth = static_cast<float>(getMostCommonKeyWidth());
- return getSquaredDistanceFloat(centerX, centerY, touchX, touchY) / SQUARE_FLOAT(keyWidth);
+ return ProximityInfoUtils::getSquaredDistanceFloat(centerX, centerY, touchX, touchY)
+ / SQUARE_FLOAT(keyWidth);
}
int ProximityInfo::getCodePointOf(const int keyIndex) const {
@@ -163,7 +164,7 @@ void ProximityInfo::initializeG() {
for (int i = 0; i < KEY_COUNT; i++) {
mKeyKeyDistancesG[i][i] = 0;
for (int j = i + 1; j < KEY_COUNT; j++) {
- mKeyKeyDistancesG[i][j] = getDistanceInt(
+ mKeyKeyDistancesG[i][j] = ProximityInfoUtils::getDistanceInt(
mCenterXsG[i], mCenterYsG[i], mCenterXsG[j], mCenterYsG[j]);
mKeyKeyDistancesG[j][i] = mKeyKeyDistancesG[i][j];
}