Changeset 5657


Ignore:
Timestamp:
10/30/09 11:15:38 (10 years ago)
Author:
melissa
Message:

Merged r5655 and r5656 into 4.1 branch.

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

Legend:

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

    r5625 r5657  
    707707          try { 
    708708            // this is the camera temperature, not the environment temperature 
    709             //store.setImagingEnvironmentTemperature(new Float(value), 0); 
     709            //store.setImagingEnvironmentTemperature(new Double(value), 0); 
    710710          } 
    711711          catch (NumberFormatException e) { 
     
    718718          if (space >= 0) value = value.substring(0, space); 
    719719          try { 
    720             store.setPlaneTimingDeltaT(new Float(value), 0, 0, currentImage); 
     720            if (currentImage < getImageCount()) { 
     721              store.setPlaneTimingDeltaT(new Float(value), 0, 0, currentImage); 
     722            } 
    721723          } 
    722724          catch (NumberFormatException e) { 
     
    762764            } 
    763765 
    764             if (i == 0) store.setStagePositionPositionX(p, 0, 0, currentImage); 
    765             if (i == 1) store.setStagePositionPositionY(p, 0, 0, currentImage); 
    766             if (i == 2) store.setStagePositionPositionZ(p, 0, 0, currentImage); 
     766            if (currentImage < getImageCount()) { 
     767              if (i == 0) { 
     768                store.setStagePositionPositionX(p, 0, 0, currentImage); 
     769              } 
     770              if (i == 1) { 
     771                store.setStagePositionPositionY(p, 0, 0, currentImage); 
     772              } 
     773              if (i == 2) { 
     774                store.setStagePositionPositionZ(p, 0, 0, currentImage); 
     775              } 
     776            } 
    767777          } 
    768778 
  • branches/4.1/components/bio-formats/src/loci/formats/out/TiffWriter.java

    r5615 r5657  
    245245    lastOffset = 0; 
    246246    imageCounts = null; 
    247     isBigTiff = false; 
    248247  } 
    249248 
    250249  // -- TiffWriter API methods -- 
    251250 
     251  /** 
     252   * Sets whether or not BigTIFF files should be written. 
     253   * This flag is not reset when close() is called. 
     254   */ 
    252255  public void setBigTiff(boolean bigTiff) { 
    253256    FormatTools.assertId(currentId, false, 1); 
Note: See TracChangeset for help on using the changeset viewer.