Changeset 7141

Timestamp:

10/27/10 21:31:32 (9 years ago)

Author:

melissa

Message:

• Backported r6227 to 4.1.
• Fixed a subtle bug in calculating the pixel data offset for PSD files with no layers.

Files:

• branches/4.1/components/bio-formats/src/loci/formats/in/PSDReader.java (modified) (1 diff)
• branches/4.1/components/common/src/loci/common/RandomAccessInputStream.java (modified) (3 diffs)
• branches/4.2/components/bio-formats/src/loci/formats/in/PSDReader.java (modified) (1 diff)
• trunk/components/bio-formats/src/loci/formats/in/PSDReader.java (modified) (1 diff)

branches/4.1/components/bio-formats/src/loci/formats/in/PSDReader.java

@@ -272 +272 @@
         }
       }
-      while (in.read() != '8');
-      in.skipBytes(7);
+      if (layerCount > 0) {
+        while (in.read() != '8');
+        in.skipBytes(7);
+      }
       int len = in.readInt();
       if ((len % 4) != 0) len += 4 - (len % 4);

branches/4.1/components/common/src/loci/common/RandomAccessInputStream.java

@@ -421 +421 @@
   /** Read a string of length n. */
   public String readString(int n) throws IOException {
+    int avail = available();
+    if (n > avail) n = avail;
     byte[] b = new byte[n];
     readFully(b);
@@ -453 +455 @@
   /** Skip n bytes within the stream. */
   public int skipBytes(int n) throws IOException {
+    if (n < 0) return 0;
     afp += n;
     return n;
@@ -540 +543 @@
   public int available() throws IOException {
     if (Boolean.FALSE.equals(fileCache.get(this))) reopen();
-    int available = dis != null ? dis.available() + ext :
-      (int) (length() - getFilePointer());
-    if (available < 0) available = Integer.MAX_VALUE;
-    return available;
+    long remain = length() - getFilePointer();
+    if (remain > Integer.MAX_VALUE) remain = Integer.MAX_VALUE;
+    return (int) remain;
   }
 

branches/4.2/components/bio-formats/src/loci/formats/in/PSDReader.java

@@ -269 +269 @@
         }
       }
-      while (in.read() != '8');
-      in.skipBytes(7);
+      if (layerCount > 0) {
+        while (in.read() != '8');
+        in.skipBytes(7);
+      }
       int len = in.readInt();
       if ((len % 4) != 0) len += 4 - (len % 4);

trunk/components/bio-formats/src/loci/formats/in/PSDReader.java

@@ -269 +269 @@
         }
       }
-      while (in.read() != '8');
-      in.skipBytes(7);
+      if (layerCount > 0) {
+        while (in.read() != '8');
+        in.skipBytes(7);
+      }
       int len = in.readInt();
       if ((len % 4) != 0) len += 4 - (len % 4);