Changeset 6967


Ignore:
Timestamp:
09/20/10 14:58:52 (9 years ago)
Author:
melissa
Message:

Fixed SizeT calculation.

File:
1 edited

Legend:

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

    r6959 r6967  
    322322    } 
    323323    else dir = dataDir; 
    324     if (nTimepoints == 0) { 
     324    if (nTimepoints == 0 || 
     325      list.length < nTimepoints * nChannels * nSlices * nWells * nPos) 
     326    { 
    325327      nTimepoints = list.length / (nChannels * nWells * nPos * nSlices); 
    326328      if (nTimepoints == 0) nTimepoints = 1; 
     
    519521        } 
    520522        else if (key.equals("timeloop count")) { 
    521           core[0].sizeT = Integer.parseInt(value); 
    522           if (getSizeT() == 0) core[0].sizeT = 1; 
     523          core[0].sizeT = Integer.parseInt(value) + 1; 
    523524        } 
    524525        else if (key.equals("name")) { 
Note: See TracChangeset for help on using the changeset viewer.