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

am 256937b4: Merge "Fix getChildrenPosition." 

* commit '256937b475a8183ac8bfa7964188071497d4fe7d':
  Fix getChildrenPosition.
main
Ken Wakasa 2013-09-18 01:38:37 -07:00 committed by Android Git Automerger
parent 6e0bdd58be 256937b475
commit 3255b9dad5
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
java/src/com/android/inputmethod/latin/makedict/BinaryDictEncoderUtils.java
View File

@ -758,8 +758,15 @@ public class BinaryDictEncoderUtils {
final FormatOptions formatOptions) {
int positionOfChildrenPosField = ptNode.mCachedAddressAfterUpdate
+ getNodeHeaderSize(ptNode, formatOptions);
if (ptNode.mFrequency >= 0) {
positionOfChildrenPosField += FormatSpec.PTNODE_FREQUENCY_SIZE;
if (ptNode.isTerminal()) {
// A terminal node has either the terminal id or the frequency.
// If positionOfChildrenPosField is incorrect, we may crash when jumping to the children
// position.
if (formatOptions.mHasTerminalId) {
positionOfChildrenPosField += FormatSpec.PTNODE_TERMINAL_ID_SIZE;
} else {
positionOfChildrenPosField += FormatSpec.PTNODE_FREQUENCY_SIZE;
}
}
return null == ptNode.mChildren ? FormatSpec.NO_CHILDREN_ADDRESS
: ptNode.mChildren.mCachedAddressAfterUpdate - positionOfChildrenPosField;