aboutsummaryrefslogtreecommitdiffstats
path: root/native/jni/src/proximity_info_state.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'native/jni/src/proximity_info_state.cpp')
-rw-r--r--native/jni/src/proximity_info_state.cpp13
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