Changeset 3801


Ignore:
Timestamp:
03/10/08 14:38:12 (12 years ago)
Author:
melissa
Message:

Fixed several bugs exposed by the test suite.

Location:
trunk/loci/formats/in
Files:
6 edited

Legend:

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

    r3781 r3801  
    522522 
    523523    if (tiffPath != null) { 
    524       if (isOIB) usedFiles.add(id); 
    525       else { 
     524      usedFiles.add(id); 
     525      if (!isOIB) { 
    526526        Location dir = new Location(tiffPath); 
    527527        String[] list = dir.list(); 
  • trunk/loci/formats/in/FluoviewReader.java

    r3790 r3801  
    7676  public FluoviewReader() { 
    7777    super("Olympus Fluoview/ABD TIFF", new String[] {"tif", "tiff"}); 
    78     blockCheckLen = 16384; 
     78    blockCheckLen = 524288; 
    7979    suffixSufficient = false; 
    8080  } 
     
    143143    // reader. 
    144144 
    145     byte[] buf = new byte[BLOCK_CHECK_LEN]; 
    146     in.seek(0); 
    147     in.read(buf); 
    148  
    149145    short[] s = TiffTools.getIFDShortArray(ifds[0], MMHEADER, true); 
    150146    byte[] mmheader = new byte[s.length]; 
     
    250246      } 
    251247      else if (name.equals("y")) { 
    252         core.sizeY[0] = size; 
     248        if (core.sizeY[0] == 0) core.sizeY[0] = size; 
    253249        voxelY = voxel; 
    254250      } 
     
    281277 
    282278    core.imageCount[0] = ifds.length; 
     279    if (core.sizeZ[0] > ifds.length) core.sizeZ[0] = ifds.length; 
     280    if (core.sizeT[0] > ifds.length) core.sizeT[0] = ifds.length; 
    283281 
    284282    if (core.imageCount[0] == 1 && (core.sizeT[0] == core.sizeY[0] || 
  • trunk/loci/formats/in/ImarisReader.java

    r3683 r3801  
    122122    int version = in.readInt(); 
    123123    addMeta("Version", new Integer(version)); 
    124     in.readInt(); 
     124    in.skipBytes(4); 
    125125 
    126126    addMeta("Image name", in.readString(128)); 
     
    144144    addMeta("Image comment", in.readString(128)); 
    145145    int isSurvey = in.readInt(); 
    146     addMeta("Survey performed", isSurvey == 0 ? "true" : "false"); 
     146    addMeta("Survey performed", String.valueOf(isSurvey == 0)); 
    147147 
    148148    status("Calculating image offsets"); 
     
    161161      pinholes[i] = in.readFloat(); 
    162162      in.skipBytes(24); 
    163       int offset = 332 + (164 * core.sizeC[0]) + 
     163      int offset = 336 + (164 * core.sizeC[0]) + 
    164164        (i * core.sizeX[0] * core.sizeY[0] * core.sizeZ[0]); 
    165165      for (int j=0; j<core.sizeZ[0]; j++) { 
  • trunk/loci/formats/in/LegacyPictReader.java

    r3617 r3801  
    102102    super.initFile(id); 
    103103    status("Populating metadata"); 
     104    core.imageCount[0] = 1; 
    104105    BufferedImage img = openImage(0); 
    105106    core.sizeX[0] = img.getWidth(); 
     
    112113    core.rgb[0] = core.sizeC[0] > 1; 
    113114    core.interleaved[0] = false; 
    114     core.imageCount[0] = 1; 
    115115    core.littleEndian[0] = false; 
    116116    core.indexed[0] = false; 
  • trunk/loci/formats/in/LeicaReader.java

    r3781 r3801  
    135135  /* @see loci.formats.IFormatReader#fileGroupOption(String) */ 
    136136  public int fileGroupOption(String id) throws FormatException, IOException { 
    137     return checkSuffix(id, LEI_SUFFIX) ? 
    138       FormatTools.MUST_GROUP : FormatTools.CAN_GROUP; 
     137    return FormatTools.MUST_GROUP; 
    139138  } 
    140139 
  • trunk/loci/formats/in/PCXReader.java

    r3737 r3801  
    2727import java.io.IOException; 
    2828import loci.formats.*; 
     29import loci.formats.meta.FilterMetadata; 
     30import loci.formats.meta.MetadataStore; 
    2931 
    3032/** 
     
    155157    core.pixelType[0] = FormatTools.UINT8; 
    156158    core.currentOrder[0] = "XYCZT"; 
     159 
     160    MetadataStore store = 
     161      new FilterMetadata(getMetadataStore(), isMetadataFiltered()); 
     162    store.setImageName("", 0); 
     163    store.setImageCreationDate( 
     164      DataTools.convertDate(System.currentTimeMillis(), DataTools.UNIX), 0); 
     165    MetadataTools.populatePixels(store, this); 
    157166  } 
    158167 
Note: See TracChangeset for help on using the changeset viewer.