Changeset 4337


Ignore:
Timestamp:
08/27/08 13:29:38 (12 years ago)
Author:
melissa
Message:
  • Don't allow channel count to be overwritten for RGB Improvision TIFF files.
  • Fixed annoying bug in ImageTools.splitChannels, and removed the workaround from ChannelSeparator.
Location:
trunk/loci/formats
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/loci/formats/ChannelSeparator.java

    r4301 r4337  
    134134 
    135135      byte[] n = ImageTools.splitChannels(lastImage, channel, c, 
    136         FormatTools.getBytesPerPixel(getPixelType()), false, !isInterleaved()); 
     136        FormatTools.getBytesPerPixel(getPixelType()), false, isInterleaved()); 
    137137      System.arraycopy(n, 0, buf, 0, n.length); 
    138138      return buf; 
  • trunk/loci/formats/ImageTools.java

    r4334 r4337  
    978978    if (reverse) index = c - index - 1; 
    979979 
    980     if (interleaved) { 
     980    if (!interleaved) { 
    981981      System.arraycopy(array, rtn.length * index, rtn, 0, rtn.length); 
    982982    } 
  • trunk/loci/formats/in/ImprovisionTiffReader.java

    r4336 r4337  
    127127 
    128128    core[0].sizeZ = Integer.parseInt(tz); 
    129     core[0].sizeC = Integer.parseInt(tc); 
     129    if (!isRGB()) core[0].sizeC = Integer.parseInt(tc); 
    130130    core[0].sizeT = Integer.parseInt(tt); 
    131131 
Note: See TracChangeset for help on using the changeset viewer.