diff options
| author |   Keisuke Kuroyanagi <ksk@google.com> | 2013-06-03 00:51:43 +0000 |
|---|---|---|
| committer |   Android (Google) Code Review <android-gerrit@google.com> | 2013-06-03 00:51:44 +0000 |
| commit | 712fefd85fa024259b81e50e98b18b749b9bde69 (patch) | |
| tree | 25a0322bc2d2e688f9315626958a176fd2c22787 /native/jni/com_android_inputmethod_latin_BinaryDictionary.cpp | |
| parent | 88ad30f40b05128d891fd412bb684bdbdc514446 (diff) | |
| parent | 0ecfb9424754341d7ee41557fc1f913cb6ca79c2 (diff) | |
| download | latinime-712fefd85fa024259b81e50e98b18b749b9bde69.tar.gz latinime-712fefd85fa024259b81e50e98b18b749b9bde69.tar.xz latinime-712fefd85fa024259b81e50e98b18b749b9bde69.zip | |
Merge "Use BinaryDictonaryInfo instead of raw pointers."
Diffstat (limited to 'native/jni/com_android_inputmethod_latin_BinaryDictionary.cpp')
| -rw-r--r-- | native/jni/com_android_inputmethod_latin_BinaryDictionary.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/native/jni/com_android_inputmethod_latin_BinaryDictionary.cpp b/native/jni/com_android_inputmethod_latin_BinaryDictionary.cpp index 9f5e2ae73..e80abf6e6 100644 --- a/native/jni/com_android_inputmethod_latin_BinaryDictionary.cpp +++ b/native/jni/com_android_inputmethod_latin_BinaryDictionary.cpp @@ -35,7 +35,8 @@ #include "jni.h" #include "jni_common.h" #include "suggest_options.h" -#include "suggest/core/dictionary/binary_format.h" +#include "suggest/core/dictionary/binary_dictionary_format.h" +#include "suggest/core/dictionary/binary_dictionary_info.h" #include "suggest/core/dictionary/dictionary.h" namespace latinime { @@ -110,8 +111,8 @@ static jlong latinime_BinaryDictionary_open(JNIEnv *env, jclass clazz, jstring s return 0; } Dictionary *dictionary = 0; - if (BinaryFormat::UNKNOWN_FORMAT - == BinaryFormat::detectFormat(static_cast<uint8_t *>(dictBuf), + if (BinaryDictionaryFormat::UNKNOWN_VERSION + == BinaryDictionaryFormat::detectFormatVersion(static_cast<uint8_t *>(dictBuf), static_cast<int>(dictSize))) { AKLOGE("DICT: dictionary format is unknown, bad magic number"); #ifdef USE_MMAP_FOR_DICTIONARY @@ -260,7 +261,7 @@ static jint latinime_BinaryDictionary_editDistance(JNIEnv *env, jclass clazz, ji static void latinime_BinaryDictionary_close(JNIEnv *env, jclass clazz, jlong dict) { Dictionary *dictionary = reinterpret_cast<Dictionary *>(dict); if (!dictionary) return; - const void *dictBuf = dictionary->getDict(); + const void *dictBuf = dictionary->getBinaryDictionaryInfo()->getDictBuf(); if (!dictBuf) return; #ifdef USE_MMAP_FOR_DICTIONARY releaseDictBuf(static_cast<const char *>(dictBuf) - dictionary->getDictBufAdjust(), |