Changeset 5117


Ignore:
Timestamp:
05/20/09 03:15:39 (11 years ago)
Author:
melissa
Message:

Eliminate use of java.awt.Rectangle in loci.formats.TiffTools.

Location:
trunk/components
Files:
1 added
2 edited

Legend:

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

    r5093 r5117  
    2424package loci.formats; 
    2525 
    26 import java.awt.Rectangle; 
    2726import java.awt.image.ColorModel; 
    2827import java.awt.image.IndexColorModel; 
     
    4342import loci.common.ReflectException; 
    4443import loci.common.ReflectedUniverse; 
     44import loci.common.Region; 
    4545import loci.formats.codec.BitBuffer; 
    4646import loci.formats.codec.Codec; 
     
    10781078    if (planarConfig == 2) numTileRows *= samplesPerPixel; 
    10791079 
    1080     Rectangle imageBounds = new Rectangle(x, y, (int) width, 
     1080    Region imageBounds = new Region(x, y, (int) width, 
    10811081      (int) (height * (samplesPerPixel / effectiveChannels))); 
    10821082 
     
    10861086    for (int row=0; row<numTileRows; row++) { 
    10871087      for (int col=0; col<numTileCols; col++) { 
    1088         Rectangle tileBounds = new Rectangle(col * (int) tileWidth, 
    1089           (int) (row * tileLength), (int) tileWidth, 
    1090           (int) tileLength); 
     1088        Region tileBounds = new Region(col * (int) tileWidth, 
     1089          (int) (row * tileLength), (int) tileWidth, (int) tileLength); 
    10911090 
    10921091        if (!imageBounds.intersects(tileBounds)) continue; 
  • trunk/components/forks/poi/src/loci/poi/hssf/dev/HSSF.java

    r5059 r5117  
    2323import java.io.FileOutputStream; 
    2424 
    25 import loci.common.*; 
     25import loci.common.RandomAccessInputStream; 
    2626 
    2727import loci.poi.poifs.filesystem.POIFSFileSystem; 
Note: See TracChangeset for help on using the changeset viewer.