Changeset 6097


Ignore:
Timestamp:
04/06/10 21:51:24 (10 years ago)
Author:
melissa
Message:

Fixed NPE.

File:
1 edited

Legend:

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

    r6092 r6097  
    621621 
    622622      IniTable acquisition = pty.getTable("Acquisition Parameters Common"); 
    623       magnification = acquisition.get("Magnification"); 
    624       lensNA = acquisition.get("ObjectiveLens NAValue"); 
    625       objectiveName = acquisition.get("ObjectiveLens Name"); 
    626       workingDistance = acquisition.get("ObjectiveLens WDValue"); 
    627       pinholeSize = acquisition.get("PinholeDiameter"); 
    628       String validBitCounts = acquisition.get("ValidBitCounts"); 
    629       if (validBitCounts != null) { 
    630         core[0].bitsPerPixel = Integer.parseInt(validBitCounts); 
     623      if (acquisition != null) { 
     624        magnification = acquisition.get("Magnification"); 
     625        lensNA = acquisition.get("ObjectiveLens NAValue"); 
     626        objectiveName = acquisition.get("ObjectiveLens Name"); 
     627        workingDistance = acquisition.get("ObjectiveLens WDValue"); 
     628        pinholeSize = acquisition.get("PinholeDiameter"); 
     629        String validBitCounts = acquisition.get("ValidBitCounts"); 
     630        if (validBitCounts != null) { 
     631          core[0].bitsPerPixel = Integer.parseInt(validBitCounts); 
     632        } 
    631633      } 
    632634 
Note: See TracChangeset for help on using the changeset viewer.