diff options
| author |   Satoshi Kataoka <satok@google.com> | 2012-08-06 16:04:07 +0900 |
|---|---|---|
| committer | Satoshi Kataoka <satok@google.com> | 2012-08-06 16:04:07 +0900 |
| commit | 44456dcbf23c29b54e9372d932b79805957724cb (patch) | |
| tree | a8167c70e9d7017f212066cf2364d1ad5b09fdca /native/jni/src/proximity_info_state.cpp | |
| parent | 07e4f9eb530a795efd97986e28546c8c5e895c72 (diff) | |
| parent | d299bde24b4afd3955fa65c7ab372807a336c6df (diff) | |
| download | latinime-44456dcbf23c29b54e9372d932b79805957724cb.tar.gz latinime-44456dcbf23c29b54e9372d932b79805957724cb.tar.xz latinime-44456dcbf23c29b54e9372d932b79805957724cb.zip | |
Merge remote-tracking branch 'goog/master' into mergescriptpackage
Conflicts:
java/res/values-af/strings.xml
java/res/values-cs/strings.xml
java/res/values-et/strings.xml
java/res/values-fi/strings.xml
java/res/values-hi/strings.xml
java/res/values-hr/strings.xml
java/res/values-hu/strings.xml
java/res/values-in/strings.xml
java/res/values-ja/strings.xml
java/res/values-ko/strings.xml
java/res/values-lt/strings.xml
java/res/values-lv/strings.xml
java/res/values-ms/strings.xml
java/res/values-pt/strings.xml
java/res/values-ro/strings.xml
java/res/values-ru/strings.xml
java/res/values-sk/strings.xml
java/res/values-sl/strings.xml
java/res/values-sr/strings.xml
java/res/values-sw/strings.xml
java/res/values-tr/strings.xml
java/res/values-vi/strings.xml
java/res/values-zh-rCN/strings.xml
java/res/values-zh-rTW/strings.xml
Change-Id: Ib4141aca0b35148d62d22d4f32309f890c84303a
Diffstat (limited to 'native/jni/src/proximity_info_state.cpp')
| -rw-r--r-- | native/jni/src/proximity_info_state.cpp | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/native/jni/src/proximity_info_state.cpp b/native/jni/src/proximity_info_state.cpp index 149299eb6..86c8a697a 100644 --- a/native/jni/src/proximity_info_state.cpp +++ b/native/jni/src/proximity_info_state.cpp @@ -14,22 +14,19 @@ * limitations under the License. */ -#include <assert.h> +#include <cstring> // for memset() #include <stdint.h> -#include <string> #define LOG_TAG "LatinIME: proximity_info_state.cpp" -#include "additional_proximity_chars.h" #include "defines.h" -#include "dictionary.h" #include "proximity_info.h" #include "proximity_info_state.h" namespace latinime { void ProximityInfoState::initInputParams( - const ProximityInfo* proximityInfo, const int32_t* inputCodes, const int inputLength, - const int* xCoordinates, const int* yCoordinates) { + const ProximityInfo *proximityInfo, const int32_t *inputCodes, const int inputLength, + const int *xCoordinates, const int *yCoordinates) { mProximityInfo = proximityInfo; mHasTouchPositionCorrectionData = proximityInfo->hasTouchPositionCorrectionData(); mMostCommonKeyWidthSquare = proximityInfo->getMostCommonKeyWidthSquare(); @@ -132,8 +129,8 @@ float ProximityInfoState::calculateSquaredDistanceFromSweetSpotCenter( const int keyIndex, const int inputIndex) const { const float sweetSpotCenterX = mProximityInfo->getSweetSpotCenterXAt(keyIndex); const float sweetSpotCenterY = mProximityInfo->getSweetSpotCenterYAt(keyIndex); - const float inputX = (float)mInputXCoordinates[inputIndex]; - const float inputY = (float)mInputYCoordinates[inputIndex]; + const float inputX = static_cast<float>(mInputXCoordinates[inputIndex]); + const float inputY = static_cast<float>(mInputYCoordinates[inputIndex]); return square(inputX - sweetSpotCenterX) + square(inputY - sweetSpotCenterY); } } // namespace latinime |