Ignore:
Timestamp:
06/18/10 13:18:49 (10 years ago)
Author:
melissa
Message:

Fixed a few issues with 16-bit LUTs.

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

Legend:

Unmodified
Added
Removed
  • branches/4.2/components/bio-formats/src/loci/formats/in/FV1000Reader.java

    r6503 r6534  
    200200  public short[][] get16BitLookupTable() { 
    201201    FormatTools.assertId(currentId, true, 1); 
    202     return lut == null ? null : lut[lastChannel]; 
     202    return lut == null || !isIndexed() ? null : lut[lastChannel]; 
    203203  } 
    204204 
  • branches/4.2/components/bio-formats/src/loci/formats/in/LIFReader.java

    r6495 r6534  
    179179  public byte[][] get8BitLookupTable() { 
    180180    FormatTools.assertId(currentId, true, 1); 
    181     if (getPixelType() != FormatTools.UINT8) return null; 
     181    if (getPixelType() != FormatTools.UINT8 || !isIndexed()) return null; 
    182182    return lastChannel < BYTE_LUTS.length ? BYTE_LUTS[lastChannel] : null; 
    183183  } 
     
    186186  public short[][] get16BitLookupTable() { 
    187187    FormatTools.assertId(currentId, true, 1); 
    188     if (getPixelType() != FormatTools.UINT16) return null; 
     188    if (getPixelType() != FormatTools.UINT16 || !isIndexed()) return null; 
    189189    return lastChannel < SHORT_LUTS.length ? SHORT_LUTS[lastChannel] : null; 
    190190  } 
Note: See TracChangeset for help on using the changeset viewer.