Changeset 5114


Ignore:
Timestamp:
05/18/09 11:06:06 (11 years ago)
Author:
melissa
Message:

More bug fixes.

Location:
trunk/components/bio-formats/src/loci/formats/in
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/components/bio-formats/src/loci/formats/in/ImprovisionTiffReader.java

    r5093 r5114  
    131131    if (tt == null) tt = "1"; 
    132132 
    133     core[0].sizeZ = Integer.parseInt(tz); 
    134     if (!isRGB()) core[0].sizeC = Integer.parseInt(tc); 
    135     core[0].sizeT = Integer.parseInt(tt); 
     133    if (getSizeZ() == 0) core[0].sizeZ = 1; 
     134    if (getSizeT() == 0) core[0].sizeT = 1; 
     135 
     136    core[0].sizeZ *= Integer.parseInt(tz); 
     137    if (!isRGB()) core[0].sizeC *= Integer.parseInt(tc); 
     138    core[0].sizeT *= Integer.parseInt(tt); 
    136139 
    137140    if (getSizeZ() * getSizeC() * getSizeT() < getImageCount()) { 
    138       core[0].sizeC = getImageCount(); 
     141      core[0].sizeC *= getImageCount(); 
    139142    } 
    140143 
  • trunk/components/bio-formats/src/loci/formats/in/MetamorphTiffReader.java

    r5093 r5114  
    162162        store.setPlaneTimingDeltaT(new Float((ms - startDate) / 1000f), 
    163163          0, 0, i); 
     164      } 
     165      if (i < exposures.size()) { 
    164166        store.setPlaneTimingExposureTime((Float) exposures.get(i), 0, 0, i); 
    165167      } 
  • trunk/components/bio-formats/src/loci/formats/in/MinimalTiffReader.java

    r5112 r5114  
    220220    Vector thumbs = new Vector(); 
    221221    for (int i=0; i<ifds.length; i++) { 
    222       boolean thumbnail = 
     222      boolean thumbnail = ifds.length > 1 && 
    223223        TiffTools.getIFDIntValue(ifds[i], TiffTools.NEW_SUBFILE_TYPE) == 1; 
    224224      if (thumbnail) thumbs.add(ifds[i]); 
  • trunk/components/bio-formats/src/loci/formats/in/NikonReader.java

    r5093 r5114  
    292292    original = null; 
    293293    split = -1; 
     294    whiteBalance = null; 
     295    cfaPattern = null; 
     296    curve = null; 
     297    vPredictor = null; 
     298    lossyCompression = false; 
    294299  } 
    295300 
Note: See TracChangeset for help on using the changeset viewer.