Changeset 3129 for trunk


Ignore:
Timestamp:
08/31/07 14:40:31 (13 years ago)
Author:
curtis
Message:

Whitespace.

Location:
trunk/loci/formats
Files:
10 edited

Legend:

Unmodified
Added
Removed
  • trunk/loci/formats/FileStitcher.java

    r3125 r3129  
    282282 
    283283  /* @see IFormatReader#isIndexed() */ 
    284   public boolean isIndexed() {  
     284  public boolean isIndexed() { 
    285285    FormatTools.assertId(currentId, true, 2); 
    286286    return reader.isIndexed(); 
  • trunk/loci/formats/FormatReader.java

    r3125 r3129  
    248248 
    249249  /* @see IFormatReader#isIndexed() */ 
    250   public boolean isIndexed() {  
     250  public boolean isIndexed() { 
    251251    return false; 
    252252  } 
  • trunk/loci/formats/IFormatReader.java

    r3125 r3129  
    9292 
    9393  /** 
    94    * Gets the 8-bit color lookup table associated with the most recently opened  
     94   * Gets the 8-bit color lookup table associated with the most recently opened 
    9595   * image. 
    9696   * If no images have been opened, or if isIndexed() returns false, then 
     
    101101 
    102102  /** 
    103    * Gets the 8-bit color lookup table associated with the most recently opened  
     103   * Gets the 8-bit color lookup table associated with the most recently opened 
    104104   * image. 
    105105   * If no images have been opened, or if isIndexed() returns false, then 
  • trunk/loci/formats/ImageReader.java

    r3125 r3129  
    231231 
    232232  /* @see IFormatReader#isIndexed() */ 
    233   public boolean isIndexed() {  
     233  public boolean isIndexed() { 
    234234    FormatTools.assertId(currentId, true, 2); 
    235235    return getReader().isIndexed(); 
  • trunk/loci/formats/IndexedColorModel.java

    r3128 r3129  
    3636  private short[] redShort, greenShort, blueShort, alphaShort; 
    3737  private int[] redInt, greenInt, blueInt, alphaInt; 
    38    
     38 
    3939  /** Length of lookup table. */ 
    4040  private int tableSize; 
     
    4444  // -- Constructors -- 
    4545 
    46   public IndexedColorModel(int bits, int size, byte[][] table)  
     46  public IndexedColorModel(int bits, int size, byte[][] table) 
    4747    throws IOException 
    4848  { 
    4949    super(bits); 
    50      
     50 
    5151    if (table == null) throw new IOException("LUT cannot be null"); 
    5252    for (int i=0; i<table.length; i++) { 
     
    5555      } 
    5656    } 
    57      
     57 
    5858    if (table.length > 0) redByte = table[0]; 
    5959    if (table.length > 1) greenByte = table[1]; 
     
    6161    if (table.length > 3) alphaByte = table[3]; 
    6262    tableSize = size; 
    63     pixelBits = bits;   
     63    pixelBits = bits; 
    6464  } 
    65    
    66   public IndexedColorModel(int bits, int size, short[][] table)  
    67     throws IOException  
     65 
     66  public IndexedColorModel(int bits, int size, short[][] table) 
     67    throws IOException 
    6868  { 
    6969    super(bits); 
    70      
     70 
    7171    if (table == null) throw new IOException("LUT cannot be null"); 
    7272    for (int i=0; i<table.length; i++) { 
     
    7575      } 
    7676    } 
    77      
     77 
    7878    if (table.length > 0) redShort = table[0]; 
    7979    if (table.length > 1) greenShort = table[1]; 
     
    8181    if (table.length > 3) alphaShort = table[3]; 
    8282    tableSize = size; 
    83     pixelBits = bits;   
     83    pixelBits = bits; 
    8484  } 
    85    
    86   public IndexedColorModel(int bits, int size, int[][] table)  
    87     throws IOException  
     85 
     86  public IndexedColorModel(int bits, int size, int[][] table) 
     87    throws IOException 
    8888  { 
    8989    super(bits); 
    90      
     90 
    9191    if (table == null) throw new IOException("LUT cannot be null"); 
    9292    for (int i=0; i<table.length; i++) { 
     
    9595      } 
    9696    } 
    97      
     97 
    9898    if (table.length > 0) redInt = table[0]; 
    9999    if (table.length > 1) greenInt = table[1]; 
     
    101101    if (table.length > 3) alphaInt = table[3]; 
    102102    tableSize = size; 
    103     pixelBits = bits;   
     103    pixelBits = bits; 
    104104  } 
    105105 
     
    118118      p[1] = (byte) green; 
    119119      p[2] = (byte) blue; 
    120        
    121       return p;  
     120 
     121      return p; 
    122122    } 
    123123    if (redShort != null) { 
     
    126126      p[1] = (short) green; 
    127127      p[2] = (short) blue; 
    128       return p;  
     128      return p; 
    129129    } 
    130130    if (redInt != null) { 
     
    133133      p[1] = green; 
    134134      p[2] = blue; 
    135       return p;  
     135      return p; 
    136136    } 
    137137    throw new UnsupportedOperationException("Invalid transfer type"); 
     
    146146  public WritableRaster createCompatibleWritableRaster(int w, int h) { 
    147147    WritableRaster raster; 
    148      
     148 
    149149    if (pixelBits == 1 || pixelBits == 2 || pixelBits == 4) { 
    150       raster = Raster.createPackedRaster(DataBuffer.TYPE_BYTE, w, h, 1,  
     150      raster = Raster.createPackedRaster(DataBuffer.TYPE_BYTE, w, h, 1, 
    151151        pixelBits, null); 
    152152    } 
    153153    else if (pixelBits <= 8) { 
    154       raster = Raster.createInterleavedRaster(DataBuffer.TYPE_BYTE, w, h, 1,  
    155         null);  
    156     }  
     154      raster = Raster.createInterleavedRaster(DataBuffer.TYPE_BYTE, w, h, 1, 
     155        null); 
     156    } 
    157157    else if (pixelBits <= 16) { 
    158158      raster = Raster.createInterleavedRaster(DataBuffer.TYPE_USHORT, w, h, 1, 
     
    160160    } 
    161161    else { 
    162       throw new UnsupportedOperationException("Pixel bits > 16 not supported");  
     162      throw new UnsupportedOperationException("Pixel bits > 16 not supported"); 
    163163    } 
    164164    return raster; 
     
    175175  /* @see java.awt.image.ColorModel#getBlue(int) */ 
    176176  public int getBlue(int pixel) { 
    177     if (blueByte != null) return blueByte[pixel] & 0xff;  
     177    if (blueByte != null) return blueByte[pixel] & 0xff; 
    178178    if (blueShort != null) return blueShort[pixel] & 0xffff; 
    179179    if (blueInt != null) return blueInt[pixel]; 
     
    183183  /* @see java.awt.image.ColorModel#getGreen(int) */ 
    184184  public int getGreen(int pixel) { 
    185     if (greenByte != null) return greenByte[pixel] & 0xff;  
     185    if (greenByte != null) return greenByte[pixel] & 0xff; 
    186186    if (greenShort != null) return greenShort[pixel] & 0xffff; 
    187187    if (greenInt != null) return greenInt[pixel]; 
  • trunk/loci/formats/ReaderWrapper.java

    r3125 r3129  
    118118  } 
    119119 
    120   public boolean isIndexed() {  
     120  public boolean isIndexed() { 
    121121    return reader.isIndexed(); 
    122122  } 
  • trunk/loci/formats/TiffTools.java

    r3120 r3129  
    590590      } 
    591591      catch (IllegalAccessException exc) { } 
    592       catch (IllegalArgumentException exc) { }  
     592      catch (IllegalArgumentException exc) { } 
    593593    } 
    594594    return "" + value; 
     
    18111811    throws FormatException, IOException 
    18121812  { 
    1813     if (compression < 0) compression += 65536;  
     1813    if (compression < 0) compression += 65536; 
    18141814    if (compression == UNCOMPRESSED) return input; 
    18151815    else if (compression == CCITT_1D) { 
  • trunk/loci/formats/in/AVIReader.java

    r3128 r3129  
    163163      lastImage = buf; 
    164164      if (no == core.imageCount[0] - 1) lastImage = null; 
    165       return buf;  
     165      return buf; 
    166166    } 
    167167 
     
    215215  public BufferedImage openImage(int no) throws FormatException, IOException { 
    216216    FormatTools.assertId(currentId, true, 1); 
    217     BufferedImage b = ImageTools.makeImage(openBytes(no), core.sizeX[0],  
     217    BufferedImage b = ImageTools.makeImage(openBytes(no), core.sizeX[0], 
    218218      core.sizeY[0], isIndexed() ? 1 : core.sizeC[0], !core.interleaved[0], 
    219219      FormatTools.getBytesPerPixel(core.pixelType[0]), core.littleEndian[0]); 
    220220    if (isIndexed()) { 
    221221      byte[][] table = get8BitLookupTable(); 
    222       IndexedColorModel model =  
     222      IndexedColorModel model = 
    223223        new IndexedColorModel(8, table[0].length, table); 
    224224      WritableRaster raster = Raster.createWritableRaster(b.getSampleModel(), 
    225225        b.getData().getDataBuffer(), null); 
    226       b = new BufferedImage(model, raster, false, null);  
     226      b = new BufferedImage(model, raster, false, null); 
    227227    } 
    228228    return b; 
  • trunk/loci/formats/in/ImageIOReader.java

    r3120 r3129  
    9797 
    9898  /* @see loci.formats.IFormatHandler#close() */ 
    99   public void close() throws IOException {  
    100     currentId = null;  
     99  public void close() throws IOException { 
     100    currentId = null; 
    101101  } 
    102102 
  • trunk/loci/formats/out/LegacyQTWriter.java

    r3123 r3129  
    172172 
    173173        r.setVar("rate", 30); 
    174          
     174 
    175175        r.exec("seq = new CSequence(gw, bounds, pixSize, codec, " + 
    176176          "CodecComponent.bestFidelityCodec, quality, quality, rate, null, " + 
Note: See TracChangeset for help on using the changeset viewer.