Changeset 6400


Ignore:
Timestamp:
05/27/10 06:16:04 (10 years ago)
Author:
callan
Message:

Merging r6398,r6399 from Trunk

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

Legend:

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

    r6376 r6400  
    286286    if (!fileOnly) { 
    287287      tiffs = usedFiles = null; 
     288      filenames = new Hashtable<Integer, String>(); 
     289      roiFilenames = new Hashtable<Integer, String>(); 
    288290      thumbReader = null; 
    289291      thumbId = null; 
  • branches/4.2/components/bio-formats/src/loci/formats/in/LeicaReader.java

    r6389 r6400  
    546546    MetadataTools.populatePixels(store, this, true); 
    547547 
     548    // Ensure we populate Image names before returning due to a possible 
     549    // minimum metadata level. 
     550    for (int i=0; i<numSeries;i ++) { 
     551      store.setImageName(seriesNames.get(i), i); 
     552    } 
    548553    if (metadataLevel == MetadataLevel.MINIMUM) return; 
    549554 
     
    563568      } 
    564569 
    565       store.setImageName(seriesNames.get(i), i); 
    566570      store.setImageDescription(seriesDescriptions.get(i), i); 
    567571 
Note: See TracChangeset for help on using the changeset viewer.