diff options
| author |   Ken Wakasa <kwakasa@google.com> | 2013-10-02 01:40:26 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2013-10-02 01:40:26 -0700 |
| commit | da4d87ff000b594ede7cdb7bcb10e9272484f467 (patch) | |
| tree | 93b1c1c149264f4df1382fc5d1592b2afa4a1cfc /java/src/com/android/inputmethod/latin/makedict/Ver4DictDecoder.java | |
| parent | 93c2fa8d3e65ab91898760e64636d5d10942ea17 (diff) | |
| parent | 2dcb63375d9f6dbdbcd1334571f6e80b4d487771 (diff) | |
| download | latinime-da4d87ff000b594ede7cdb7bcb10e9272484f467.tar.gz latinime-da4d87ff000b594ede7cdb7bcb10e9272484f467.tar.xz latinime-da4d87ff000b594ede7cdb7bcb10e9272484f467.zip | |
am 2dcb6337: Merge "Make SparseTable have multiple content tables."
* commit '2dcb63375d9f6dbdbcd1334571f6e80b4d487771':
Make SparseTable have multiple content tables.
Diffstat (limited to 'java/src/com/android/inputmethod/latin/makedict/Ver4DictDecoder.java')
| -rw-r--r-- | java/src/com/android/inputmethod/latin/makedict/Ver4DictDecoder.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/java/src/com/android/inputmethod/latin/makedict/Ver4DictDecoder.java b/java/src/com/android/inputmethod/latin/makedict/Ver4DictDecoder.java index 89370f0dc..27cb1c244 100644 --- a/java/src/com/android/inputmethod/latin/makedict/Ver4DictDecoder.java +++ b/java/src/com/android/inputmethod/latin/makedict/Ver4DictDecoder.java @@ -131,7 +131,7 @@ public class Ver4DictDecoder extends DictDecoder { mDictDirectory.getName() + FormatSpec.BIGRAM_LOOKUP_TABLE_FILE_EXTENSION); final File contentFile = new File(mDictDirectory, mDictDirectory.getName() + FormatSpec.BIGRAM_ADDRESS_TABLE_FILE_EXTENSION); - mBigramAddressTable = SparseTable.readFromFiles(lookupIndexFile, contentFile, + mBigramAddressTable = SparseTable.readFromFiles(lookupIndexFile, new File[] { contentFile }, FormatSpec.BIGRAM_ADDRESS_TABLE_BLOCK_SIZE); } @@ -208,7 +208,7 @@ public class Ver4DictDecoder extends DictDecoder { final ArrayList<PendingAttribute> bigrams; if (0 != (flags & FormatSpec.FLAG_HAS_BIGRAMS)) { bigrams = new ArrayList<PendingAttribute>(); - final int posOfBigrams = mBigramAddressTable.get(terminalId); + final int posOfBigrams = mBigramAddressTable.get(0 /* contentTableIndex */, terminalId); mBigramBuffer.position(posOfBigrams); while (bigrams.size() < FormatSpec.MAX_BIGRAMS_IN_A_PTNODE) { // If bigrams.size() reaches FormatSpec.MAX_BIGRAMS_IN_A_PTNODE, |