Changeset 3120


Ignore:
Timestamp:
08/29/07 08:16:01 (13 years ago)
Author:
melissa
Message:

Miscellaneous bugfixes.

Location:
trunk/loci/formats
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/loci/formats/TiffTools.java

    r3104 r3120  
    590590      } 
    591591      catch (IllegalAccessException exc) { } 
     592      catch (IllegalArgumentException exc) { }  
    592593    } 
    593594    return "" + value; 
     
    14051406      // Now make our image. 
    14061407      return ImageTools.makeImage(sampleData, 
    1407         (int) imageWidth, (int) imageLength, validBits); 
     1408        (int) imageWidth, (int) imageLength); 
    14081409    } 
    14091410    else if (bitsPerSample[0] == 24) { 
     
    18101811    throws FormatException, IOException 
    18111812  { 
     1813    if (compression < 0) compression += 65536;  
    18121814    if (compression == UNCOMPRESSED) return input; 
    18131815    else if (compression == CCITT_1D) { 
  • trunk/loci/formats/in/ICSReader.java

    r3097 r3120  
    207207    status("Finding companion file"); 
    208208 
    209     Location l = new Location(id); 
    210209    //String icsId = l.getPath(), idsId = l.getPath(); 
    211210    String icsId = id, idsId = id; 
  • trunk/loci/formats/in/ImageIOReader.java

    r3097 r3120  
    9797 
    9898  /* @see loci.formats.IFormatHandler#close() */ 
    99   public void close() throws IOException { } 
     99  public void close() throws IOException {  
     100    currentId = null;  
     101  } 
    100102 
    101103  // -- Internal FormatReader API methods -- 
Note: See TracChangeset for help on using the changeset viewer.