Changeset 3248


Ignore:
Timestamp:
10/09/07 13:57:12 (12 years ago)
Author:
melissa
Message:

Fixed series/currentSeries typo; update file map along with IFD map.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/loci/formats/in/OMETiffReader.java

    r3246 r3248  
    113113 
    114114    int ifd = ifdMap[series][no]; 
    115     int fileIndex = fileMap[currentSeries][no]; 
     115    int fileIndex = fileMap[series][no]; 
    116116 
    117117    in = new RandomAccessStream(used[fileIndex]); 
     
    404404          Vector v = new Vector(sizeZ * sizeC * sizeT); 
    405405          Vector y = new Vector(sizeZ * sizeC * sizeT); 
    406           if (tempIfdMap.size() >= seriesCount) { 
     406          if (tempIfdMap.size() >= seriesCount && tempIfdMap.size() > 0) { 
    407407            v = (Vector) tempIfdMap.get(seriesCount - 1); 
    408408            y = (Vector) tempFileMap.get(seriesCount - 1); 
     
    425425          if (tempIfdMap.size() > seriesCount) { 
    426426            tempIfdMap.setElementAt(v, seriesCount); 
    427           } 
    428           else tempIfdMap.add(v); 
     427            tempFileMap.setElementAt(y, seriesCount); 
     428          } 
     429          else { 
     430            tempIfdMap.add(v); 
     431            tempFileMap.add(y); 
     432          } 
    429433        } 
    430434        else { 
Note: See TracChangeset for help on using the changeset viewer.