Changeset 7141 for branches/4.2


Ignore:
Timestamp:
10/27/10 21:31:32 (10 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.
File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/4.2/components/bio-formats/src/loci/formats/in/PSDReader.java

    r7007 r7141  
    269269        } 
    270270      } 
    271       while (in.read() != '8'); 
    272       in.skipBytes(7); 
     271      if (layerCount > 0) { 
     272        while (in.read() != '8'); 
     273        in.skipBytes(7); 
     274      } 
    273275      int len = in.readInt(); 
    274276      if ((len % 4) != 0) len += 4 - (len % 4); 
Note: See TracChangeset for help on using the changeset viewer.