Changeset 2386


Ignore:
Timestamp:
03/06/07 08:39:58 (13 years ago)
Author:
melissa
Message:

Minor bugfixes.

Location:
trunk/loci/formats/in
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/loci/formats/in/ICSReader.java

    r2382 r2386  
    125125  public boolean isRGB(String id) throws FormatException, IOException { 
    126126    if (!id.equals(currentIdsId) && !id.equals(currentIcsId)) initFile(id); 
    127     return rgb; 
     127    return rgb && sizeC[0] > 1; 
    128128  } 
    129129 
  • trunk/loci/formats/in/LeicaReader.java

    r2351 r2386  
    967967        pt += 4; 
    968968 
     969        if (nChannels > 4) nChannels = 3; 
    969970        numChannels[i] = nChannels; 
    970971 
     
    10851086      sizeT[i] += 1; 
    10861087      currentOrder[i] = sizeC[i] == 1 ? "XYZTC" : "XYCZT"; 
     1088      if (sizeZ[i] == 0) sizeZ[i] = 1; 
    10871089 
    10881090      int tPixelType = ((Integer) getMeta("Bytes per pixel")).intValue(); 
     
    11131115        new Integer(zs[i]), 
    11141116        new Integer(numChannels[i] == 0 ? 1 : numChannels[i]), // SizeC 
    1115         new Integer(1), // SizeT 
     1117        new Integer(sizeT[i]), // SizeT 
    11161118        new Integer(pixelType[i]), // PixelType 
    11171119        new Boolean(!littleEndian), // BigEndian 
Note: See TracChangeset for help on using the changeset viewer.