Changeset 3239

Timestamp:

10/08/07 12:07:59 (12 years ago)

Author:

melissa

Message:

Fixed bug with >2GB files.

File:

• trunk/loci/formats/in/LIFReader.java (modified) (2 diffs)

trunk/loci/formats/in/LIFReader.java

@@ -149 +149 @@
       }
 
-      int blockLength = in.readInt();
+      long blockLength = in.readInt();
       if (in.read() != 0x2a) {
-        in.skipBytes(3);
+        in.seek(in.getFilePointer() - 5);
+        blockLength = in.readLong();
         if (in.read() != 0x2a) {
           throw new FormatException("Invalid Memory Description");
@@ -163 +164 @@
         offsets.add(new Long(in.getFilePointer()));
       }
-
-      in.skipBytes(blockLength);
+      long skipped = 0;
+      while (skipped < blockLength) {
+        if (blockLength - skipped > 4096) {
+          skipped += in.skipBytes(4096);
+        }
+        else {
+          skipped += in.skipBytes((int) (blockLength - skipped));
+        }
+      }
     }
     initMetadata(xml);