diff options
| author |   Yuichiro Hanada <yhanada@google.com> | 2013-08-26 01:33:07 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2013-08-26 01:33:07 -0700 |
| commit | 5ab2ab12d43b06e7448e974aa8eb03a76a0d97ab (patch) | |
| tree | cfe5a594c50cced1222dba974ef6d89234767ef2 /java/src | |
| parent | b0f59af0ffc098ac674e53605a24feebac0c8ff5 (diff) | |
| parent | b50a7a4bc718f3611ac1e97a940d5a59b4b0133e (diff) | |
| download | latinime-5ab2ab12d43b06e7448e974aa8eb03a76a0d97ab.tar.gz latinime-5ab2ab12d43b06e7448e974aa8eb03a76a0d97ab.tar.xz latinime-5ab2ab12d43b06e7448e974aa8eb03a76a0d97ab.zip | |
am b50a7a4b: Simplify computeActualNodeArraySize.
* commit 'b50a7a4bc718f3611ac1e97a940d5a59b4b0133e':
Simplify computeActualNodeArraySize.
Diffstat (limited to 'java/src')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/makedict/BinaryDictEncoderUtils.java | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/java/src/com/android/inputmethod/latin/makedict/BinaryDictEncoderUtils.java b/java/src/com/android/inputmethod/latin/makedict/BinaryDictEncoderUtils.java index b95db2183..79f5ad8bd 100644 --- a/java/src/com/android/inputmethod/latin/makedict/BinaryDictEncoderUtils.java +++ b/java/src/com/android/inputmethod/latin/makedict/BinaryDictEncoderUtils.java @@ -326,15 +326,11 @@ public class BinaryDictEncoderUtils { } int nodeSize = getNodeHeaderSize(ptNode, formatOptions); if (ptNode.isTerminal()) nodeSize += FormatSpec.PTNODE_FREQUENCY_SIZE; - if (null == ptNode.mChildren && formatOptions.mSupportsDynamicUpdate) { + if (formatOptions.mSupportsDynamicUpdate) { nodeSize += FormatSpec.SIGNED_CHILDREN_ADDRESS_SIZE; } else if (null != ptNode.mChildren) { - if (formatOptions.mSupportsDynamicUpdate) { - nodeSize += FormatSpec.SIGNED_CHILDREN_ADDRESS_SIZE; - } else { - nodeSize += getByteSize(getOffsetToTargetNodeArrayDuringUpdate(ptNodeArray, - nodeSize + size, ptNode.mChildren)); - } + nodeSize += getByteSize(getOffsetToTargetNodeArrayDuringUpdate(ptNodeArray, + nodeSize + size, ptNode.mChildren)); } nodeSize += getShortcutListSize(ptNode.mShortcutTargets); if (null != ptNode.mBigrams) { |