Adapt StarDict.java to the current DictZip interface

Gbp-Pq: Name 05-update-dictzip.patch

1 files changed, 4 insertions, 7 deletions

diff --git a/src/org/omegat/core/dictionaries/StarDict.java b/src/org/omegat/core/dictionaries/StarDict.java
index 2dbada9..d04548f 100644
--- a/src/org/omegat/core/dictionaries/StarDict.java
+++ b/src/org/omegat/core/dictionaries/StarDict.java
@@ -326,12 +326,14 @@ public class StarDict implements IDictionaryFactory {
          * DictZip has a header that indicates data offset. When try retrieving
          * data, use header information as an index for random access.
          */
+        /*
         private DictZipHeader getDZHeader(DictZipInputStream din) throws IOException {
             if (fHeader == null) {
                 fHeader = din.readHeader();
             }
             return fHeader;
         }
+        */
 
         /**
          * Read .dict.dz file data. Intended to be called only from
@@ -350,14 +352,9 @@ public class StarDict implements IDictionaryFactory {
             try {
                 in = new RandomAccessInputStream(dataFile, "r");
                 din = new DictZipInputStream(in);
-                DictZipHeader h = getDZHeader(din);
-                int off = h.getOffset(start);
-                int pos = h.getPosition(start);
-                in.seek(pos);
-                byte[] b = new byte[off + len];
-                din.readFully(b);
+                in.seek(start);
                 byte[] data = new byte[len];
-                System.arraycopy(b, off, data, 0, len);
+                din.readFully(data);
                 result = new String(data, OConsts.UTF8);
                 din.close();
                 in.close();