Changeset 6298


Ignore:
Timestamp:
05/12/10 17:52:15 (10 years ago)
Author:
curtis
Message:

Fix compile error in TIFF pixels test.

Location:
trunk/components/bio-formats
Files:
2 edited

Legend:

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

    r6294 r6298  
    174174    int height = (int) ifd.getImageLength(); 
    175175    int bytesPerPixel = FormatTools.getBytesPerPixel(pixelType); 
    176     int plane = (int) (width * height * bytesPerPixel); 
     176    int plane = width * height * bytesPerPixel; 
    177177    int nChannels = buf.length / plane; 
    178178    boolean interleaved = ifd.getPlanarConfiguration() == 1; 
    179179 
    180     boolean indexed = ifd.getIFDValue(IFD.COLOR_MAP) != null; 
     180    //boolean indexed = ifd.getIFDValue(IFD.COLOR_MAP) != null; 
    181181 
    182182    makeValidIFD(ifd, pixelType, nChannels); 
     
    518518        long newOffset; 
    519519        if (bigTiff) { 
    520           newCount = (int) (ifdBuf.readInt() & 0xffffffff); 
     520          newCount = ifdBuf.readInt() & 0xffffffff; 
    521521          newOffset = ifdBuf.readLong(); 
    522522        } 
  • trunk/components/bio-formats/test/loci/formats/utests/tiff/TiffPixelsTest.java

    r6128 r6298  
    155155    RandomAccessOutputStream out = new RandomAccessOutputStream(savedData); 
    156156    TiffSaver saver = new TiffSaver(out); 
    157     saver.writeImage(data, ifd, false, FormatTools.UINT16); 
     157    saver.writeImage(data, ifd, 0, FormatTools.UINT16, false); 
    158158    out.close(); 
    159159    RandomAccessInputStream in = new RandomAccessInputStream(savedData); 
Note: See TracChangeset for help on using the changeset viewer.