Changeset 7462


Ignore:
Timestamp:
12/24/10 16:15:44 (9 years ago)
Author:
melissa
Message:
  • Fixed various TIFF-parsing related problems introduced in r7459.
  • Finished Trestle metadata parsing; closes #479.
Location:
trunk/components/bio-formats/src/loci/formats/in
Files:
6 edited

Legend:

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

    r6881 r7462  
    142142        ifd.putAll(tmpIFDs.get(i*2 + 1)); 
    143143        ifd.putAll(tmpIFDs.get(i*2)); 
     144        tiffParser.fillInIFD(ifd); 
    144145      } 
    145146    } 
  • trunk/components/bio-formats/src/loci/formats/in/ImaconReader.java

    r7401 r7462  
    118118      core[i].imageCount = 1; 
    119119      IFD ifd = ifds.get(i); 
     120      tiffParser.fillInIFD(ifd); 
    120121      ifd.remove(PIXELS_TAG); 
    121122 
  • trunk/components/bio-formats/src/loci/formats/in/JPKReader.java

    r6881 r7462  
    8787      core[s] = new CoreMetadata(); 
    8888      IFD ifd = ifds.get(s); 
     89      tiffParser.fillInIFD(ifd); 
    8990      PhotoInterp p = ifd.getPhotometricInterpretation(); 
    9091      int samples = ifd.getSamplesPerPixel(); 
  • trunk/components/bio-formats/src/loci/formats/in/MinimalTiffReader.java

    r7459 r7462  
    215215 
    216216    lastPlane = no; 
    217     tiffParser.fillInIFD(ifds.get(no)); 
    218217    tiffParser.getSamples(ifds.get(no), buf, x, y, w, h); 
    219218 
     
    332331    core[0].imageCount = ifds.size(); 
    333332 
     333    for (IFD ifd : ifds) { 
     334      tiffParser.fillInIFD(ifd); 
     335    } 
     336 
    334337    IFD firstIFD = ifds.get(0); 
    335     tiffParser.fillInIFD(firstIFD); 
    336338 
    337339    PhotoInterp photo = firstIFD.getPhotometricInterpretation(); 
  • trunk/components/bio-formats/src/loci/formats/in/SVSReader.java

    r6881 r7462  
    9696      setSeries(i); 
    9797      core[i] = new CoreMetadata(); 
     98      tiffParser.fillInIFD(ifds.get(i)); 
    9899 
    99100      if (getMetadataOptions().getMetadataLevel() != MetadataLevel.MINIMUM) { 
  • trunk/components/bio-formats/src/loci/formats/in/TrestleReader.java

    r7455 r7462  
    143143 
    144144    ifds = tiffParser.getIFDs(); 
     145    for (IFD ifd : ifds) { 
     146      tiffParser.fillInIFD(ifd); 
     147    } 
     148 
     149    String comment = ifds.get(0).getComment(); 
     150    String[] values = comment.split(";"); 
     151    for (String v : values) { 
     152      int eq = v.indexOf("="); 
     153      if (eq < 0) continue; 
     154      String key = v.substring(0, eq).trim(); 
     155      String value = v.substring(eq + 1).trim(); 
     156      addGlobalMeta(key, value); 
     157    } 
    145158 
    146159    core = new CoreMetadata[ifds.size()]; 
Note: See TracChangeset for help on using the changeset viewer.