Changeset 6855


Ignore:
Timestamp:
08/28/10 12:53:29 (9 years ago)
Author:
melissa
Message:

Backported r6068 to 4.1.

Location:
branches/4.1/components/bio-formats/src/loci/formats/in
Files:
2 edited

Legend:

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

    r5447 r6855  
    206206      } 
    207207      // exposure times are stored in milliseconds, we want them in seconds 
    208       exposures.add(new Float(Float.parseFloat(value) / 1000)); 
     208      try { 
     209        exposures.add(new Float(Float.parseFloat(value) / 1000)); 
     210      } 
     211      catch (NumberFormatException e) { } 
    209212    } 
    210213  } 
  • branches/4.1/components/bio-formats/src/loci/formats/in/MetamorphTiffReader.java

    r5675 r6855  
    103103      } 
    104104    } 
    105     core[0].sizeC = uniqueC.size(); 
     105    int effectiveC = uniqueC.size(); 
     106    if (effectiveC == 0) effectiveC = 1; 
     107    core[0].sizeC = effectiveC * ifds.get(0).getSamplesPerPixel(); 
    106108 
    107109    Vector<Float> uniqueZ = new Vector<Float>(); 
     
    111113    } 
    112114    core[0].sizeZ = uniqueZ.size(); 
    113     core[0].sizeT = ifds.size() / (getSizeZ() * getSizeC()); 
     115    core[0].sizeT = ifds.size() / (getSizeZ() * effectiveC); 
    114116 
    115117    MetadataStore store = 
Note: See TracChangeset for help on using the changeset viewer.