Changeset 6746


Ignore:
Timestamp:
07/28/10 16:11:34 (9 years ago)
Author:
melissa
Message:

Remainder of type checking fixes. Closes #273.

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

Legend:

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

    r6655 r6746  
    8585    domains = new String[] {FormatTools.HCS_DOMAIN}; 
    8686    suffixSufficient = false; 
     87    suffixNecessary = false; 
    8788  } 
    8889 
     
    131132      int offset = getSeries() * getImageCount(); 
    132133      for (int i = 0; i<getImageCount(); i++) { 
    133         if (tiffs[offset + i] != null) { files.add(tiffs[offset + i]); } 
     134        if (offset + i < tiffs.length) { 
     135          if (tiffs[offset + i] != null) { 
     136            files.add(tiffs[offset + i]); 
     137          } 
     138        } 
    134139      } 
    135140    } 
  • trunk/components/bio-formats/src/loci/formats/in/IvisionReader.java

    r6655 r6746  
    9090    try { 
    9191      Double.parseDouble(version); 
    92       return version.indexOf(".") != -1; 
     92      return version.indexOf(".") != -1 && version.indexOf("-") == -1; 
    9393    } 
    9494    catch (NumberFormatException e) { } 
Note: See TracChangeset for help on using the changeset viewer.