diff options
| author |   Ken Wakasa <kwakasa@google.com> | 2012-08-02 05:07:43 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2012-08-02 05:07:43 -0700 |
| commit | 6c465d9d26c7389357dedd4b71c6a95ccb6f019c (patch) | |
| tree | 7bb46286f51ff0a1349577cc741940d21e918603 /native/jni/src/proximity_info_state.cpp | |
| parent | 2af1b1241b120e0e9df53edd415601e14fc54e0e (diff) | |
| parent | 77e8e81ad95cfc1eb8f8407fc872674b8d08bbe9 (diff) | |
| download | latinime-6c465d9d26c7389357dedd4b71c6a95ccb6f019c.tar.gz latinime-6c465d9d26c7389357dedd4b71c6a95ccb6f019c.tar.xz latinime-6c465d9d26c7389357dedd4b71c6a95ccb6f019c.zip | |
am 77e8e81a: Header cleanup. Moved a couple of functions from .h to .cpp.
* commit '77e8e81ad95cfc1eb8f8407fc872674b8d08bbe9':
Header cleanup. Moved a couple of functions from .h to .cpp.
Diffstat (limited to 'native/jni/src/proximity_info_state.cpp')
| -rw-r--r-- | native/jni/src/proximity_info_state.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/native/jni/src/proximity_info_state.cpp b/native/jni/src/proximity_info_state.cpp index 04a201712..86c8a697a 100644 --- a/native/jni/src/proximity_info_state.cpp +++ b/native/jni/src/proximity_info_state.cpp @@ -14,14 +14,12 @@ * limitations under the License. */ -#include <cassert> +#include <cstring> // for memset() #include <stdint.h> #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" @@ -131,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 |