Changeset 7126


Ignore:
Timestamp:
10/25/10 14:23:20 (9 years ago)
Author:
melissa
Message:

Reversed usage of OMETiffReader's getMetadataStoreForDisplay() and getMetadataStoreForConversion(); getMetadataStore() is now equivalent to getMetadataStoreForConversion(). See #556.

Files:
6 edited

Legend:

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

    r7101 r7126  
    640640 
    641641    MetadataTools.populatePixels(metadataStore, this, false, false); 
    642     metadataStore = getMetadataStoreForDisplay(); 
     642    metadataStore = getMetadataStoreForConversion(); 
    643643  } 
    644644 
  • branches/4.2/components/bio-formats/src/loci/formats/tools/ImageConverter.java

    r7072 r7126  
    216216 
    217217    MetadataStore store = reader.getMetadataStore(); 
    218     IFormatReader base = reader;  
     218    IFormatReader base = reader; 
    219219 
    220220    if (base instanceof ReaderWrapper) { 
     
    226226    if (base instanceof ImageReader) { 
    227227      base = ((ImageReader) base).getReader(); 
    228     } 
    229     if (base instanceof OMETiffReader) { 
    230       store = ((OMETiffReader) base).getMetadataStoreForConversion(); 
    231228    } 
    232229 
  • branches/4.2/components/bio-formats/src/loci/formats/tools/ImageInfo.java

    r7007 r7126  
    112112 
    113113  private IFormatReader reader; 
     114  private IFormatReader baseReader; 
    114115  private MinMaxCalculator minMaxCalc; 
    115116  private DimensionSwapper dimSwapper; 
     
    295296    } 
    296297    if (reader == null) reader = new ImageReader(); 
     298    baseReader = reader; 
    297299  } 
    298300 
     
    849851    LOGGER.info(""); 
    850852    MetadataStore ms = reader.getMetadataStore(); 
     853 
     854    if (baseReader instanceof ImageReader) { 
     855      baseReader = ((ImageReader) baseReader).getReader(); 
     856    } 
     857    if (baseReader instanceof OMETiffReader) { 
     858      ms = ((OMETiffReader) baseReader).getMetadataStoreForDisplay(); 
     859    } 
     860 
    851861    OMEXMLService service; 
    852862    try { 
  • trunk/components/bio-formats/src/loci/formats/in/OMETiffReader.java

    r7051 r7126  
    640640 
    641641    MetadataTools.populatePixels(metadataStore, this, false, false); 
    642     metadataStore = getMetadataStoreForDisplay(); 
     642    metadataStore = getMetadataStoreForConversion(); 
    643643  } 
    644644 
  • trunk/components/bio-formats/src/loci/formats/tools/ImageConverter.java

    r7072 r7126  
    216216 
    217217    MetadataStore store = reader.getMetadataStore(); 
    218     IFormatReader base = reader;  
     218    IFormatReader base = reader; 
    219219 
    220220    if (base instanceof ReaderWrapper) { 
     
    226226    if (base instanceof ImageReader) { 
    227227      base = ((ImageReader) base).getReader(); 
    228     } 
    229     if (base instanceof OMETiffReader) { 
    230       store = ((OMETiffReader) base).getMetadataStoreForConversion(); 
    231228    } 
    232229 
  • trunk/components/bio-formats/src/loci/formats/tools/ImageInfo.java

    r6881 r7126  
    112112 
    113113  private IFormatReader reader; 
     114  private IFormatReader baseReader; 
    114115  private MinMaxCalculator minMaxCalc; 
    115116  private DimensionSwapper dimSwapper; 
     
    295296    } 
    296297    if (reader == null) reader = new ImageReader(); 
     298    baseReader = reader; 
    297299  } 
    298300 
     
    849851    LOGGER.info(""); 
    850852    MetadataStore ms = reader.getMetadataStore(); 
     853 
     854    if (baseReader instanceof ImageReader) { 
     855      baseReader = ((ImageReader) baseReader).getReader(); 
     856    } 
     857    if (baseReader instanceof OMETiffReader) { 
     858      ms = ((OMETiffReader) baseReader).getMetadataStoreForDisplay(); 
     859    } 
     860 
    851861    OMEXMLService service; 
    852862    try { 
Note: See TracChangeset for help on using the changeset viewer.