Changeset 3018 for trunk


Ignore:
Timestamp:
07/30/07 10:04:52 (13 years ago)
Author:
melissa
Message:

Fixed NullPointerException.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/loci/formats/ome/OMEXMLMetadataStore.java

    r3015 r3018  
    532532  public Double getGlobalMin(Integer pixels, Integer channel) { 
    533533    int ndx = channel == null ? 0 : channel.intValue(); 
    534     if (ndx >= channelMinimum.length) return null; 
     534    if (channelMinimum == null || ndx >= channelMinimum.length) return null; 
    535535    return new Double(channelMinimum[ndx]); 
    536536  } 
     
    539539  public Double getGlobalMax(Integer pixels, Integer channel) { 
    540540    int ndx = channel == null ? 0 : channel.intValue(); 
    541     if (ndx >= channelMaximum.length) return null; 
     541    if (channelMaximum == null || ndx >= channelMaximum.length) return null; 
    542542    return new Double(channelMaximum[ndx]); 
    543543  } 
     
    548548   */ 
    549549  public Float getTimestamp(Integer pixels, Integer z, Integer c, Integer t) { 
    550     // TODO 
    551550    return null; 
    552551  } 
     
    558557  public Float getExposureTime(Integer pixels, Integer z, Integer c, Integer t) 
    559558  { 
    560     // TODO 
    561559    return null; 
    562560  } 
Note: See TracChangeset for help on using the changeset viewer.