Ignore:
Timestamp:
05/20/10 11:13:45 (10 years ago)
Author:
melissa
Message:

Fixed various bugs exposed by test suite.

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

Legend:

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

    r6230 r6349  
    10891089        } 
    10901090 
    1091         store.setRectangleX(points[0], r, 0); 
    1092         store.setRectangleY(points[1], r, 0); 
    1093         store.setRectangleWidth(points[2] - points[0], r, 0); 
    1094         store.setRectangleHeight(points[3] - points[1], r, 0); 
     1091        store.setRectangleX(points[0], r, 1); 
     1092        store.setRectangleY(points[1], r, 1); 
     1093        store.setRectangleWidth(points[2] - points[0], r, 1); 
     1094        store.setRectangleHeight(points[3] - points[1], r, 1); 
    10951095      } 
    10961096      else if (type.equals("HorizontalLine") || type.equals("VerticalLine")) { 
  • branches/4.2/components/bio-formats/src/loci/formats/in/NativeQTReader.java

    r6230 r6349  
    618618  /** Cut off header bytes from a resource fork file. */ 
    619619  private void stripHeader() throws IOException { 
    620     in.findString("moov"); 
    621     in.seek(in.getFilePointer() - 4); 
     620    in.seek(0); 
     621    while (!in.readString(4).equals("moov")) { 
     622      in.seek(in.getFilePointer() - 2); 
     623    } 
     624    in.seek(in.getFilePointer() - 8); 
    622625  } 
    623626 
  • branches/4.2/components/bio-formats/src/loci/formats/in/OpenlabReader.java

    r6334 r6349  
    546546      core[i].metadataComplete = true; 
    547547    } 
     548 
     549    for (int s=0; s<getSeriesCount(); s++) { 
     550      setSeries(s); 
     551      parseImageNames(s); 
     552    } 
    548553    setSeries(0); 
    549  
    550     for (int s=0; s<getSeriesCount(); s++) { 
    551       parseImageNames(s); 
    552     } 
    553554 
    554555    MetadataStore store = makeFilterMetadata(); 
     
    704705        } 
    705706      } 
     707    } 
     708 
     709    if (core[s].rgb && uniqueC.size() <= 1) { 
     710      core[s].dimensionOrder = core[s].dimensionOrder.replaceAll("C", ""); 
     711      core[s].dimensionOrder = "XYC" + core[s].dimensionOrder.substring(2); 
    706712    } 
    707713 
  • branches/4.2/components/bio-formats/src/loci/formats/in/ScanrReader.java

    r6317 r6349  
    156156      metadataFiles.clear(); 
    157157      wellLabels.clear(); 
     158      wellCount = 0; 
    158159    } 
    159160  } 
     
    182183  protected void initFile(String id) throws FormatException, IOException { 
    183184    super.initFile(id); 
     185    if (metadataFiles.size() > 0) { 
     186      // this dataset has already been initialized 
     187      return; 
     188    } 
    184189 
    185190    // make sure we have the .xml file 
Note: See TracChangeset for help on using the changeset viewer.