diff options
| author |   Jean Chalard <jchalard@google.com> | 2012-05-29 00:27:51 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2012-05-29 00:27:51 -0700 |
| commit | adb2719395f4ce124a31b4f48fce970a6b080f78 (patch) | |
| tree | 98cc4e1d378acd5d3807675128eb66c0f91064fb | |
| parent | a62f6e363d3a835e92f9fb8781fb726161f0f97f (diff) | |
| parent | ca134ccc2a65f568741f0111dcd7c29aa6560ac6 (diff) | |
| download | latinime-adb2719395f4ce124a31b4f48fce970a6b080f78.tar.gz latinime-adb2719395f4ce124a31b4f48fce970a6b080f78.tar.xz latinime-adb2719395f4ce124a31b4f48fce970a6b080f78.zip | |
am ca134ccc: am bf61bba3: Merge "Fix two small possible bugs." into jb-dev
* commit 'ca134ccc2a65f568741f0111dcd7c29aa6560ac6':
Fix two small possible bugs.
| -rw-r--r-- | native/jni/src/bigram_dictionary.cpp | 2 | ||||
| -rw-r--r-- | native/jni/src/binary_format.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/native/jni/src/bigram_dictionary.cpp b/native/jni/src/bigram_dictionary.cpp index ac2a26172..8c73f4400 100644 --- a/native/jni/src/bigram_dictionary.cpp +++ b/native/jni/src/bigram_dictionary.cpp @@ -149,8 +149,8 @@ int BigramDictionary::getBigramListPositionForWord(const int32_t *prevWord, } else { pos = BinaryFormat::skipOtherCharacters(root, pos); } - pos = BinaryFormat::skipChildrenPosition(flags, pos); pos = BinaryFormat::skipFrequency(flags, pos); + pos = BinaryFormat::skipChildrenPosition(flags, pos); pos = BinaryFormat::skipShortcuts(root, flags, pos); return pos; } diff --git a/native/jni/src/binary_format.h b/native/jni/src/binary_format.h index 40f197619..4a1649c5e 100644 --- a/native/jni/src/binary_format.h +++ b/native/jni/src/binary_format.h @@ -421,7 +421,7 @@ inline int BinaryFormat::getWordAtAddress(const uint8_t* const root, const int a // We count chars in order to avoid infinite loops if the file is broken or // if there is some other bug int charCount = maxDepth; - while (-1 != nextChar && --charCount > 0) { + while (NOT_A_CHARACTER != nextChar && --charCount > 0) { outWord[++wordPos] = nextChar; nextChar = getCharCodeAndForwardPointer(root, &pos); } |