diff options
| author |   Satoshi Kataoka <satok@google.com> | 2012-08-24 00:34:54 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2012-08-24 00:34:54 -0700 |
| commit | 38bfa2f8685bc25ea39e881d322ae9f96e005847 (patch) | |
| tree | 3926b6f3456196b410a5d9b7705ea76409e11a44 | |
| parent | 8c1005f2ec8855051afc04364a55c26ffc077ecc (diff) | |
| parent | 48f0460d4c91d83209d226cb12d81a1174eaa438 (diff) | |
| download | latinime-38bfa2f8685bc25ea39e881d322ae9f96e005847.tar.gz latinime-38bfa2f8685bc25ea39e881d322ae9f96e005847.tar.xz latinime-38bfa2f8685bc25ea39e881d322ae9f96e005847.zip | |
am 48f0460d: Merge "Refactor" into jb-mr1-dev
* commit '48f0460d4c91d83209d226cb12d81a1174eaa438':
Refactor
| -rw-r--r-- | native/jni/src/proximity_info_state.cpp | 8 | ||||
| -rw-r--r-- | 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); |