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

am fe9dca7e: Merge "Read multi-byte char group counts" 

* commit 'fe9dca7ec3814956e6e545c383106156f568d047':
  Read multi-byte char group counts
main
Jean Chalard 2012-01-15 23:28:07 -08:00 committed by Android Git Automerger
parent 44cf7a12f6 fe9dca7ec3
commit 06f2692c78
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
native/src/binary_format.h
View File

@ -61,7 +61,9 @@ inline int BinaryFormat::detectFormat(const uint8_t* const dict) {
} }
inline int BinaryFormat::getGroupCountAndForwardPointer(const uint8_t* const dict, int* pos) { inline int BinaryFormat::getGroupCountAndForwardPointer(const uint8_t* const dict, int* pos) {
return dict[(*pos)++]; const int msb = dict[(*pos)++];
if (msb < 0x80) return msb;
return ((msb & 0x7F) << 8) | dict[(*pos)++];
} }
inline uint8_t BinaryFormat::getFlagsAndForwardPointer(const uint8_t* const dict, int* pos) { inline uint8_t BinaryFormat::getFlagsAndForwardPointer(const uint8_t* const dict, int* pos) {

5
native/src/unigram_dictionary.cpp
View File

@ -507,9 +507,10 @@ int UnigramDictionary::getMostFrequentWordLikeInner(const uint16_t * const inWor
int maxFreq = -1; int maxFreq = -1;
const uint8_t* const root = DICT_ROOT; const uint8_t* const root = DICT_ROOT;
mStackChildCount[0] = root[0]; int startPos = 0;
mStackChildCount[0] = BinaryFormat::getGroupCountAndForwardPointer(root, &startPos);
mStackInputIndex[0] = 0; mStackInputIndex[0] = 0;
mStackSiblingPos[0] = 1; mStackSiblingPos[0] = startPos;
while (depth >= 0) { while (depth >= 0) {
const int charGroupCount = mStackChildCount[depth]; const int charGroupCount = mStackChildCount[depth];
int pos = mStackSiblingPos[depth]; int pos = mStackSiblingPos[depth];