Changeset 7353

Timestamp:

12/07/10 13:41:13 (9 years ago)

Author:

melissa

Message:

• Allow the same plane to be read multiple times in succession.
• Fixed row indices when cropping images.

File:

• trunk/components/bio-formats/src/loci/formats/in/NativeQTReader.java (modified) (2 diffs)

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

@@ -178 +178 @@
       !code.equals(altCodec);
 
-    byte[] t = uncompress(pixs, code);
+    byte[] t = prevPlane == no && prevPixels != null && !code.equals(altCodec) ?
+      prevPixels : uncompress(pixs, code);
     if (code.equals("rpza")) {
       for (int i=0; i<t.length; i++) {
@@ -226 +227 @@
       if (bitsPerPixel == 32) {
         for (int col=0; col<w; col++) {
-          int src = row * getSizeX() * bpp * 4 + (x + col) * bpp * 4 + 1;
+          int src = (row + y) * getSizeX() * bpp * 4 + (x + col) * bpp * 4 + 1;
           int dst = row * destRowLen + col * bpp * 3;
           if (src + 3 <= t.length && dst + 3 <= buf.length) {