aboutsummaryrefslogtreecommitdiffstats
path: root/java/src/com/android/inputmethod/latin/makedict/BinaryDictIOUtils.java
diff options
context:
space:
mode:
authorYuichiro Hanada <yhanada@google.com>2013-08-20 00:14:07 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-08-20 00:14:07 -0700
commit19c0b5b27633704377b777571b33562db17b9fca (patch)
treec8d7ac6ef2331385881c17c8fa98f958e06a2b9e /java/src/com/android/inputmethod/latin/makedict/BinaryDictIOUtils.java
parentbff4d2443238dcb5dbc123a1ce11220acd19271d (diff)
parent66004ce2de1579d8ae1fb3411ce98f1e9e37cf8b (diff)
downloadlatinime-19c0b5b27633704377b777571b33562db17b9fca.tar.gz
latinime-19c0b5b27633704377b777571b33562db17b9fca.tar.xz
latinime-19c0b5b27633704377b777571b33562db17b9fca.zip
am 66004ce2: Remove populateOptions.
* commit '66004ce2de1579d8ae1fb3411ce98f1e9e37cf8b': Remove populateOptions.
Diffstat (limited to 'java/src/com/android/inputmethod/latin/makedict/BinaryDictIOUtils.java')
-rw-r--r--java/src/com/android/inputmethod/latin/makedict/BinaryDictIOUtils.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/java/src/com/android/inputmethod/latin/makedict/BinaryDictIOUtils.java b/java/src/com/android/inputmethod/latin/makedict/BinaryDictIOUtils.java
index 4cf72e915..1abc779d0 100644
--- a/java/src/com/android/inputmethod/latin/makedict/BinaryDictIOUtils.java
+++ b/java/src/com/android/inputmethod/latin/makedict/BinaryDictIOUtils.java
@@ -153,7 +153,7 @@ public final class BinaryDictIOUtils {
final Map<Integer, ArrayList<PendingAttribute>> bigrams) throws IOException,
UnsupportedFormatException {
// Read header
- final FileHeader header = BinaryDictDecoderUtils.readHeader(dictDecoder);
+ final FileHeader header = dictDecoder.readHeader();
readUnigramsAndBigramsBinaryInner(dictDecoder.getDictBuffer(), header.mHeaderSize, words,
frequencies, bigrams, header.mFormatOptions);
}
@@ -175,7 +175,7 @@ public final class BinaryDictIOUtils {
if (word == null) return FormatSpec.NOT_VALID_WORD;
if (dictBuffer.position() != 0) dictBuffer.position(0);
- final FileHeader header = BinaryDictDecoderUtils.readHeader(dictDecoder);
+ final FileHeader header = dictDecoder.readHeader();
int wordPos = 0;
final int wordLen = word.codePointCount(0, word.length());
for (int depth = 0; depth < Constants.DICTIONARY_MAX_WORD_LENGTH; ++depth) {
@@ -523,7 +523,7 @@ public final class BinaryDictIOUtils {
final DictBuffer dictBuffer = dictDecoder.getDictBuffer();
if (position != FormatSpec.NOT_VALID_WORD) {
dictBuffer.position(0);
- final FileHeader header = BinaryDictDecoderUtils.readHeader(dictDecoder);
+ final FileHeader header = dictDecoder.readHeader();
dictBuffer.position(position);
return BinaryDictDecoderUtils.readCharGroup(dictBuffer, position,
header.mFormatOptions);
@@ -559,7 +559,7 @@ public final class BinaryDictIOUtils {
}
}
});
- return BinaryDictDecoderUtils.readHeader(dictDecoder);
+ return dictDecoder.readHeader();
}
public static FileHeader getDictionaryFileHeaderOrNull(final File file, final long offset,