Changeset 5126


Ignore:
Timestamp:
05/27/09 13:17:56 (11 years ago)
Author:
melissa
Message:

Eliminated java.awt.Point from format readers.

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

Legend:

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

    r5093 r5126  
    2424package loci.formats.in; 
    2525 
    26 import java.awt.image.BufferedImage; 
    2726import java.io.IOException; 
    2827import java.util.Hashtable; 
     
    6463  /** Pixel dimensions for this file. */ 
    6564  private float voxelX = 1f, voxelY = 1f, voxelZ = 1f, voxelC = 1f, voxelT = 1f; 
    66  
    67   /** First image. */ 
    68   private BufferedImage zeroImage = null; 
    6965 
    7066  private String dimensionOrder; 
     
    165161    super.close(); 
    166162    voxelX = voxelY = voxelZ = voxelC = voxelT = 1f; 
    167     zeroImage = null; 
    168163    dimensionOrder = null; 
    169164  } 
  • trunk/components/bio-formats/src/loci/formats/in/InCellReader.java

    r5121 r5126  
    2424package loci.formats.in; 
    2525 
    26 import java.awt.Point; 
    2726import java.io.IOException; 
    2827import java.util.Hashtable; 
     
    518517    public void endElement(String uri, String localName, String qName) { 
    519518      if (qName.equals("Image")) { 
    520         Point p = new Point(currentRow, currentCol); 
    521         wellCoordinates.put(new Integer(currentField), p); 
     519        wellCoordinates.put(new Integer(currentField), 
     520          new int[] {currentRow, currentCol}); 
    522521        openImage = false; 
    523522 
  • trunk/components/bio-formats/src/loci/formats/in/NativeND2Reader.java

    r5093 r5126  
    2424package loci.formats.in; 
    2525 
    26 import java.awt.Point; 
    2726import java.io.IOException; 
    2827import java.util.Hashtable; 
     
    246245        if (blockType.startsWith("ImageDataSeq")) { 
    247246          imageOffsets.add(new Long(fp)); 
    248           imageLengths.add(new Point(lenOne, lenTwo)); 
     247          imageLengths.add(new int[] {lenOne, lenTwo}); 
    249248        } 
    250249        else if (blockType.startsWith("Image")) { 
    251250          xmlOffsets.add(new Long(fp)); 
    252           xmlLengths.add(new Point(lenOne, lenTwo)); 
     251          xmlLengths.add(new int[] {lenOne, lenTwo}); 
    253252        } 
    254253        else if (blockType.startsWith("CustomData|A")) { 
    255254          customDataOffsets.add(new Long(fp)); 
    256           customDataLengths.add(new Point(lenOne, lenTwo)); 
     255          customDataLengths.add(new int[] {lenOne, lenTwo}); 
    257256        } 
    258257      } 
     
    265264      for (int i=0; i<xmlOffsets.size(); i++) { 
    266265        long offset = ((Long) xmlOffsets.get(i)).longValue(); 
    267         Point p = (Point) xmlLengths.get(i); 
    268         int length = (int) (p.x + p.y); 
     266        int[] p = (int[]) xmlLengths.get(i); 
     267        int length = p[0] + p[1]; 
    269268 
    270269        byte[] b = new byte[length]; 
     
    349348      for (int i=0; i<imageOffsets.size(); i++) { 
    350349        long offset = ((Long) imageOffsets.get(i)).longValue(); 
    351         Point p = (Point) imageLengths.get(i); 
    352         int length = (int) (p.x + p.y); 
     350        int[] p = (int[]) imageLengths.get(i); 
     351        int length = p[0] + p[1]; 
    353352 
    354353        in.seek(offset); 
     
    376375        if (seriesIndex < offsets.length && plane < offsets[seriesIndex].length) 
    377376        { 
    378           offsets[seriesIndex][plane] = offset + p.x + 8; 
     377          offsets[seriesIndex][plane] = offset + p[0] + 8; 
    379378        } 
    380379        b = null; 
     
    444443      if (customDataOffsets.size() > 0) { 
    445444        in.seek(((Long) customDataOffsets.get(0)).longValue()); 
    446         Point p = (Point) customDataLengths.get(0); 
    447         int len = (int) (p.x + p.y); 
     445        int[] p = (int[]) customDataLengths.get(0); 
     446        int len = p[0] + p[1]; 
    448447 
    449448        int timestampBytes = imageOffsets.size() * 8; 
Note: See TracChangeset for help on using the changeset viewer.