diff options
| author |   satok <satok@google.com> | 2012-03-13 01:41:46 -0700 |
|---|---|---|
| committer |   Android (Google) Code Review <android-gerrit@google.com> | 2012-03-13 01:41:46 -0700 |
| commit | 8e08bfb8debe2c3e03f2feb47174922537d02aad (patch) | |
| tree | 4804f7521b6307effe7ab348c3a46be187a05467 /native/src/proximity_info.cpp | |
| parent | aee5f03d6ebf9cb03b52cbea003556f38745b4fe (diff) | |
| parent | 552c3c27f04e6769e40cffbce3a9e8eed1269294 (diff) | |
| download | latinime-8e08bfb8debe2c3e03f2feb47174922537d02aad.tar.gz latinime-8e08bfb8debe2c3e03f2feb47174922537d02aad.tar.xz latinime-8e08bfb8debe2c3e03f2feb47174922537d02aad.zip | |
Merge "Implement additional proximity characters in the native code Bug: 4343280"
Diffstat (limited to 'native/src/proximity_info.cpp')
| -rw-r--r-- | native/src/proximity_info.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/native/src/proximity_info.cpp b/native/src/proximity_info.cpp index ad19f58b5..561fffa90 100644 --- a/native/src/proximity_info.cpp +++ b/native/src/proximity_info.cpp @@ -16,10 +16,11 @@ #include <assert.h> #include <stdio.h> -#include <string.h> +#include <string> #define LOG_TAG "LatinIME: proximity_info.cpp" +#include "additional_proximity_chars.h" #include "dictionary.h" #include "proximity_info.h" @@ -33,9 +34,9 @@ inline void copyOrFillZero(void *to, const void *from, size_t size) { } } -ProximityInfo::ProximityInfo(const int maxProximityCharsSize, const int keyboardWidth, - const int keyboardHeight, const int gridWidth, const int gridHeight, - const int mostCommonKeyWidth, +ProximityInfo::ProximityInfo(const std::string localeStr, const int maxProximityCharsSize, + const int keyboardWidth, const int keyboardHeight, const int gridWidth, + const int gridHeight, const int mostCommonKeyWidth, const uint32_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, |