diff options
| author |   Ken Wakasa <kwakasa@google.com> | 2012-08-03 17:59:26 +0900 |
|---|---|---|
| committer | Ken Wakasa <kwakasa@google.com> | 2012-08-03 18:37:58 +0900 |
| commit | 1d8a246e392e0ab4b1e7c8a60e67c00fca05c93c (patch) | |
| tree | 980e398ca7f063ab4242e92788e6f65b6feeff87 /native/jni | |
| parent | 77e8e81ad95cfc1eb8f8407fc872674b8d08bbe9 (diff) | |
| download | latinime-1d8a246e392e0ab4b1e7c8a60e67c00fca05c93c.tar.gz latinime-1d8a246e392e0ab4b1e7c8a60e67c00fca05c93c.tar.xz latinime-1d8a246e392e0ab4b1e7c8a60e67c00fca05c93c.zip | |
Header cleanup
Change-Id: I1aa91708d0de01ca3e84e69ec8d3a3832c386ca8
Diffstat (limited to 'native/jni')
| -rw-r--r-- | native/jni/com_android_inputmethod_keyboard_ProximityInfo.cpp | 9 | ||||
| -rw-r--r-- | native/jni/com_android_inputmethod_latin_BinaryDictionary.cpp | 3 | ||||
| -rw-r--r-- | native/jni/jni_common.cpp | 3 |
3 files changed, 7 insertions, 8 deletions
diff --git a/native/jni/com_android_inputmethod_keyboard_ProximityInfo.cpp b/native/jni/com_android_inputmethod_keyboard_ProximityInfo.cpp index 93e19b367..74390ccdf 100644 --- a/native/jni/com_android_inputmethod_keyboard_ProximityInfo.cpp +++ b/native/jni/com_android_inputmethod_keyboard_ProximityInfo.cpp @@ -16,6 +16,8 @@ #define LOG_TAG "LatinIME: jni: ProximityInfo" +#include <string> + #include "com_android_inputmethod_keyboard_ProximityInfo.h" #include "jni.h" #include "jni_common.h" @@ -42,10 +44,9 @@ static jlong latinime_Keyboard_setProximityInfo(JNIEnv *env, jobject object, jfloat *sweetSpotCenterYs = safeGetFloatArrayElements(env, sweetSpotCenterYArray); jfloat *sweetSpotRadii = safeGetFloatArrayElements(env, sweetSpotRadiusArray); ProximityInfo *proximityInfo = new ProximityInfo( - localeStr, maxProximityCharsSize, displayWidth, - displayHeight, gridWidth, gridHeight, mostCommonkeyWidth, - (const int32_t*)proximityChars, - keyCount, (const int32_t*)keyXCoordinates, (const int32_t*)keyYCoordinates, + localeStr, maxProximityCharsSize, displayWidth, displayHeight, gridWidth, gridHeight, + mostCommonkeyWidth, (const int32_t*)proximityChars, 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); diff --git a/native/jni/com_android_inputmethod_latin_BinaryDictionary.cpp b/native/jni/com_android_inputmethod_latin_BinaryDictionary.cpp index 2d3d96309..776f5f78f 100644 --- a/native/jni/com_android_inputmethod_latin_BinaryDictionary.cpp +++ b/native/jni/com_android_inputmethod_latin_BinaryDictionary.cpp @@ -25,8 +25,9 @@ #include "jni_common.h" #ifdef USE_MMAP_FOR_DICTIONARY -#include <sys/mman.h> +#include <cerrno> #include <fcntl.h> +#include <sys/mman.h> #else // USE_MMAP_FOR_DICTIONARY #include <cstdlib> #endif // USE_MMAP_FOR_DICTIONARY diff --git a/native/jni/jni_common.cpp b/native/jni/jni_common.cpp index cb2351db1..105a4dc4c 100644 --- a/native/jni/jni_common.cpp +++ b/native/jni/jni_common.cpp @@ -22,11 +22,8 @@ #include "defines.h" #include "jni.h" #include "jni_common.h" -#include "proximity_info.h" #include <cassert> -#include <cerrno> -#include <cstdio> using namespace latinime; |