nyancrimew
/
LatinIME
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

am ca134ccc: am bf61bba3: Merge "Fix two small possible bugs." into jb-dev 

* commit 'ca134ccc2a65f568741f0111dcd7c29aa6560ac6':
  Fix two small possible bugs.
main
Jean Chalard 2012-05-29 00:27:51 -07:00 committed by Android Git Automerger
parent a62f6e363d ca134ccc2a
commit adb2719395
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
native/jni/src/bigram_dictionary.cpp
View File

@ -149,8 +149,8 @@ int BigramDictionary::getBigramListPositionForWord(const int32_t *prevWord,
} else { } else {
pos = BinaryFormat::skipOtherCharacters(root, pos); pos = BinaryFormat::skipOtherCharacters(root, pos);
} }
pos = BinaryFormat::skipChildrenPosition(flags, pos);
pos = BinaryFormat::skipFrequency(flags, pos); pos = BinaryFormat::skipFrequency(flags, pos);
pos = BinaryFormat::skipChildrenPosition(flags, pos);
pos = BinaryFormat::skipShortcuts(root, flags, pos); pos = BinaryFormat::skipShortcuts(root, flags, pos);
return pos; return pos;
} }

2
native/jni/src/binary_format.h
View File

@ -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 // We count chars in order to avoid infinite loops if the file is broken or
// if there is some other bug // if there is some other bug
int charCount = maxDepth; int charCount = maxDepth;
while (-1 != nextChar && --charCount > 0) { while (NOT_A_CHARACTER != nextChar && --charCount > 0) {
outWord[++wordPos] = nextChar; outWord[++wordPos] = nextChar;
nextChar = getCharCodeAndForwardPointer(root, &pos); nextChar = getCharCodeAndForwardPointer(root, &pos);
} }