aboutsummaryrefslogtreecommitdiffstats
path: root/native/src/proximity_info.h
diff options
context:
space:
mode:
authorsatok <satok@google.com>2012-03-13 20:26:22 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-03-13 20:26:22 -0700
commit6338b9f2c6a001f4a0fe9ee97779c1c83e47d85a (patch)
tree056a584065d33bf80c6939d6e129b30dcd4abe34 /native/src/proximity_info.h
parent76e3861981174c96d97f5803d3afed9b7b667e46 (diff)
parent0cb2097a45a41875ec2265da316eb770565b6706 (diff)
downloadlatinime-6338b9f2c6a001f4a0fe9ee97779c1c83e47d85a.tar.gz
latinime-6338b9f2c6a001f4a0fe9ee97779c1c83e47d85a.tar.xz
latinime-6338b9f2c6a001f4a0fe9ee97779c1c83e47d85a.zip
Merge "Fix additional proximity in the native code"
Diffstat (limited to 'native/src/proximity_info.h')
-rw-r--r--native/src/proximity_info.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/native/src/proximity_info.h b/native/src/proximity_info.h
index 8c342e0ef..1a47aff84 100644
--- a/native/src/proximity_info.h
+++ b/native/src/proximity_info.h
@@ -47,7 +47,7 @@ class ProximityInfo {
ProximityInfo(const std::string localeStr, const int maxProximityCharsSize,
const int keyboardWidth, const int keybaordHeight, const int gridWidth,
const int gridHeight, const int mostCommonkeyWidth,
- const uint32_t *proximityCharsArray, const int keyCount, const int32_t *keyXCoordinates,
+ const int32_t *proximityCharsArray, const int keyCount, const int32_t *keyXCoordinates,
const int32_t *keyYCoordinates, const int32_t *keyWidths, const int32_t *keyHeights,
const int32_t *keyCharCodes, const float *sweetSpotCenterXs,
const float *sweetSpotCenterYs, const float *sweetSpotRadii);
@@ -92,7 +92,7 @@ class ProximityInfo {
bool isOnKey(const int keyId, const int x, const int y);
int squaredDistanceToEdge(const int keyId, const int x, const int y);
void calculateNearbyKeyCodes(
- const int x, const int y, const uint32_t primaryKey, int *inputCodes);
+ const int x, const int y, const int32_t primaryKey, int *inputCodes);
const int MAX_PROXIMITY_CHARS_SIZE;
const int KEYBOARD_WIDTH;
@@ -109,7 +109,7 @@ class ProximityInfo {
const int *mInputXCoordinates;
const int *mInputYCoordinates;
bool mTouchPositionCorrectionEnabled;
- uint32_t *mProximityCharsArray;
+ int32_t *mProximityCharsArray;
int *mNormalizedSquaredDistances;
int32_t mKeyXCoordinates[MAX_KEY_COUNT_IN_A_KEYBOARD];
int32_t mKeyYCoordinates[MAX_KEY_COUNT_IN_A_KEYBOARD];