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

am 8f4d5d5f: Fix getDictionaryFileHeader. 

* commit '8f4d5d5f23fd45a88da1fc394475abe8b3e6f415':
  Fix getDictionaryFileHeader.
main
Yuichiro Hanada 2013-08-23 07:11:42 -07:00 committed by Android Git Automerger
parent 6bdc19173f 8f4d5d5f23
commit b9f0a7eaf2
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
java/src/com/android/inputmethod/latin/makedict/BinaryDictIOUtils.java
View File

@ -517,7 +517,7 @@ public final class BinaryDictIOUtils {
* @param offset The offset in the file where to start reading the data. * @param offset The offset in the file where to start reading the data.
* @param length The length of the data file. * @param length The length of the data file.
*/ */
public static FileHeader getDictionaryFileHeader( private static FileHeader getDictionaryFileHeader(
final File file, final long offset, final long length) final File file, final long offset, final long length)
throws FileNotFoundException, IOException, UnsupportedFormatException { throws FileNotFoundException, IOException, UnsupportedFormatException {
final byte[] buffer = new byte[HEADER_READING_BUFFER_SIZE]; final byte[] buffer = new byte[HEADER_READING_BUFFER_SIZE];
@ -528,6 +528,7 @@ public final class BinaryDictIOUtils {
throws FileNotFoundException, IOException { throws FileNotFoundException, IOException {
final FileInputStream inStream = new FileInputStream(file); final FileInputStream inStream = new FileInputStream(file);
try { try {
inStream.skip(offset);
inStream.read(buffer); inStream.read(buffer);
return new ByteArrayDictBuffer(buffer); return new ByteArrayDictBuffer(buffer);
} finally { } finally {

8
java/src/com/android/inputmethod/latin/utils/DictionaryInfoUtils.java
View File

@ -281,13 +281,7 @@ public class DictionaryInfoUtils {
} }
public static FileHeader getDictionaryFileHeaderOrNull(final File file) { public static FileHeader getDictionaryFileHeaderOrNull(final File file) {
try { return BinaryDictIOUtils.getDictionaryFileHeaderOrNull(file, 0, file.length());
return BinaryDictIOUtils.getDictionaryFileHeader(file, 0, file.length());
} catch (UnsupportedFormatException e) {
return null;
} catch (IOException e) {
return null;
}
} }
private static DictionaryInfo createDictionaryInfoFromFileAddress( private static DictionaryInfo createDictionaryInfoFromFileAddress(