Changeset 6164 for branches/4.1


Ignore:
Timestamp:
04/21/10 14:37:19 (10 years ago)
Author:
melissa
Message:

Ported a few channel splitting fixes from trunk.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/4.1/components/bio-formats/src/loci/formats/in/ZeissLSMReader.java

    r5664 r6164  
    300300    IFDList ifds = ifdsList.get(getSeries()); 
    301301 
    302     if (splitPlanes && getSizeC() > 1) { 
     302    if (splitPlanes && getSizeC() > 1 && ifds.size() == getSizeZ() * getSizeT()) 
     303    { 
    303304      int plane = no / getSizeC(); 
    304305      int c = no % getSizeC(); 
     
    822823    } 
    823824    int nLogicalChannels = nextDataChannel == 0 ? 1 : nextDataChannel; 
    824     if (nLogicalChannels == getSizeC()) { 
     825    if (nLogicalChannels == getSizeC() || nextDataChannel == 0) { 
    825826      if (!splitPlanes) splitPlanes = isRGB(); 
     827      core[series].rgb = false; 
     828      if (splitPlanes) core[series].imageCount *= getSizeC(); 
     829    } 
     830    else if (splitPlanes) { 
    826831      core[series].rgb = false; 
    827832      if (splitPlanes) core[series].imageCount *= getSizeC(); 
Note: See TracChangeset for help on using the changeset viewer.