diff options
Diffstat (limited to 'dictionary/jni/com_android_inputmethod_latin_BinaryDictionary.cpp')
-rw-r--r-- | dictionary/jni/com_android_inputmethod_latin_BinaryDictionary.cpp | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/dictionary/jni/com_android_inputmethod_latin_BinaryDictionary.cpp b/dictionary/jni/com_android_inputmethod_latin_BinaryDictionary.cpp index a1f410db2..c9e158c4c 100644 --- a/dictionary/jni/com_android_inputmethod_latin_BinaryDictionary.cpp +++ b/dictionary/jni/com_android_inputmethod_latin_BinaryDictionary.cpp @@ -42,7 +42,7 @@ static jmethodID sAddWordMethod; // // helper function to throw an exception // -static void throwException(JNIEnv *env, const char* ex, const char* fmt, int data) +static void throwException(JNIEnv *env, const char* ex, const char* fmt, int data) { if (jclass cls = env->FindClass(ex)) { char msg[1000]; @@ -66,7 +66,7 @@ static jint latinime_BinaryDictionary_open Asset *dictAsset = am->openNonAsset(resourcePath, Asset::ACCESS_BUFFER); if (dictAsset == NULL) { - LOGE("DICT: Couldn't get asset %s\n", resourcePath); + LOGE("DICT: Couldn't get asset %s\n", resourcePath); env->ReleaseStringUTFChars(resourceString, resourcePath); return 0; } @@ -79,15 +79,15 @@ static jint latinime_BinaryDictionary_open } Dictionary *dictionary = new Dictionary(dict, typedLetterMultiplier, fullWordMultiplier); dictionary->setAsset(dictAsset); - + env->ReleaseStringUTFChars(resourceString, resourcePath); - return (jint) dictionary; + return (jint) dictionary; } static int latinime_BinaryDictionary_getSuggestions( - JNIEnv *env, jobject object, jint dict, jintArray inputArray, jint arraySize, - jcharArray outputArray, jintArray frequencyArray, jint maxWordLength, jint maxWords, - jint maxAlternatives) + JNIEnv *env, jobject object, jint dict, jintArray inputArray, jint arraySize, + jcharArray outputArray, jintArray frequencyArray, jint maxWordLength, jint maxWords, + jint maxAlternatives, jint skipPos) { Dictionary *dictionary = (Dictionary*) dict; if (dictionary == NULL) @@ -96,9 +96,9 @@ static int latinime_BinaryDictionary_getSuggestions( int *frequencies = env->GetIntArrayElements(frequencyArray, NULL); int *inputCodes = env->GetIntArrayElements(inputArray, NULL); jchar *outputChars = env->GetCharArrayElements(outputArray, NULL); - + int count = dictionary->getSuggestions(inputCodes, arraySize, (unsigned short*) outputChars, frequencies, - maxWordLength, maxWords, maxAlternatives); + maxWordLength, maxWords, maxAlternatives, skipPos); env->ReleaseIntArrayElements(frequencyArray, frequencies, 0); env->ReleaseIntArrayElements(inputArray, inputCodes, JNI_ABORT); @@ -112,16 +112,16 @@ static jboolean latinime_BinaryDictionary_isValidWord { Dictionary *dictionary = (Dictionary*) dict; if (dictionary == NULL) return (jboolean) false; - + jchar *word = env->GetCharArrayElements(wordArray, NULL); jboolean result = dictionary->isValidWord((unsigned short*) word, wordLength); env->ReleaseCharArrayElements(wordArray, word, JNI_ABORT); - + return result; } static void latinime_BinaryDictionary_close - (JNIEnv *env, jobject object, jint dict) + (JNIEnv *env, jobject object, jint dict) { Dictionary *dictionary = (Dictionary*) dict; ((Asset*) dictionary->getAsset())->close(); @@ -131,10 +131,10 @@ static void latinime_BinaryDictionary_close // ---------------------------------------------------------------------------- static JNINativeMethod gMethods[] = { - {"openNative", "(Landroid/content/res/AssetManager;Ljava/lang/String;II)I", + {"openNative", "(Landroid/content/res/AssetManager;Ljava/lang/String;II)I", (void*)latinime_BinaryDictionary_open}, {"closeNative", "(I)V", (void*)latinime_BinaryDictionary_close}, - {"getSuggestionsNative", "(I[II[C[IIII)I", (void*)latinime_BinaryDictionary_getSuggestions}, + {"getSuggestionsNative", "(I[II[C[IIIII)I", (void*)latinime_BinaryDictionary_getSuggestions}, {"isValidWordNative", "(I[CI)Z", (void*)latinime_BinaryDictionary_isValidWord} }; @@ -153,7 +153,7 @@ static int registerNativeMethods(JNIEnv* env, const char* className, fprintf(stderr, "RegisterNatives failed for '%s'\n", className); return JNI_FALSE; } - + return JNI_TRUE; } @@ -161,21 +161,21 @@ static int registerNatives(JNIEnv *env) { const char* const kClassPathName = "com/android/inputmethod/latin/BinaryDictionary"; jclass clazz; - + clazz = env->FindClass("java/io/FileDescriptor"); if (clazz == NULL) { LOGE("Can't find %s", "java/io/FileDescriptor"); return -1; } sDescriptorField = env->GetFieldID(clazz, "descriptor", "I"); - + clazz = env->FindClass("android/content/res/AssetManager"); if (clazz == NULL) { LOGE("Can't find %s", "java/io/FileDescriptor"); return -1; } sAssetManagerNativeField = env->GetFieldID(clazz, "mObject", "I"); - + return registerNativeMethods(env, kClassPathName, gMethods, sizeof(gMethods) / sizeof(gMethods[0])); } |