From 233aad5e5c7567a97af30f38f50a65365f729dfe Mon Sep 17 00:00:00 2001
From: Satoshi Kataoka <satok@google.com>
Date: Fri, 24 Aug 2012 14:45:54 +0900
Subject: [PATCH] Refactor
Change-Id: I907126034d9cc821df8353a78f713638dfc322d6
---
native/jni/src/proximity_info_state.cpp | 8 ++++----
native/jni/src/proximity_info_state.h | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/native/jni/src/proximity_info_state.cpp b/native/jni/src/proximity_info_state.cpp
index 0bb6dd9cb..422068db2 100644
--- a/native/jni/src/proximity_info_state.cpp
+++ b/native/jni/src/proximity_info_state.cpp
@@ -25,7 +25,7 @@
#include "proximity_info_state.h"
namespace latinime {
-void ProximityInfoState::initInputParams(const int pointerId, const float maxLength,
+void ProximityInfoState::initInputParams(const int pointerId, const float maxPointToKeyLength,
const ProximityInfo *proximityInfo, const int32_t *inputCodes, const int inputSize,
const int *const xCoordinates, const int *const yCoordinates, const int *const times,
const int *const pointerIds, const bool isGeometric) {
@@ -68,7 +68,7 @@ void ProximityInfoState::initInputParams(const int pointerId, const float maxLen
}
}
- mMaxPointToKeyLength = maxLength;
+ mMaxPointToKeyLength = maxPointToKeyLength;
///////////////////////
// Setup touch points
mInputXs.clear();
@@ -115,8 +115,8 @@ void ProximityInfoState::initInputParams(const int pointerId, const float maxLen
}
mPrimaryInputWord[inputSize] = 0;
- mTouchPositionCorrectionEnabled =
- mHasTouchPositionCorrectionData && xCoordinates && yCoordinates && !isGeometric;
+ mTouchPositionCorrectionEnabled = mInputSize > 0 && mHasTouchPositionCorrectionData
+ && xCoordinates && yCoordinates && !isGeometric;
for (int i = 0; i < mInputSize && mTouchPositionCorrectionEnabled; ++i) {
const int *proximityChars = getProximityCharsAt(i);
const int primaryKey = proximityChars[0];
diff --git a/native/jni/src/proximity_info_state.h b/native/jni/src/proximity_info_state.h
index 81d68fdcb..178000446 100644
--- a/native/jni/src/proximity_info_state.h
+++ b/native/jni/src/proximity_info_state.h
@@ -41,7 +41,7 @@ class ProximityInfoState {
/////////////////////////////////////////
// Defined in proximity_info_state.cpp //
/////////////////////////////////////////
- void initInputParams(const int pointerId, const float maxLength,
+ void initInputParams(const int pointerId, const float maxPointToKeyLength,
const ProximityInfo *proximityInfo, const int32_t *inputCodes, const int inputSize,
const int *xCoordinates, const int *yCoordinates, const int *const times,
const int *const pointerIds, const bool isGeometric);