Changeset 7169

Timestamp:

11/06/10 09:50:36 (9 years ago)

Author:

melissa

Message:

Backported r6515, r6527, and most of r7071 to fix a few problems with reading certain Metamorph files.

Location:

branches/4.1/components/bio-formats/src/loci/formats/in

Files:

• L2DReader.java (modified) (1 diff)
• MetamorphReader.java (modified) (1 diff)

branches/4.1/components/bio-formats/src/loci/formats/in/L2DReader.java

@@ -89 +89 @@
     }
 
+    if (parent.getParent() == null) return false;
     parent = parent.getParentFile();
     if (parent == null) return false;

branches/4.1/components/bio-formats/src/loci/formats/in/MetamorphReader.java

@@ -116 +116 @@
   /** Constructs a new Metamorph reader. */
   public MetamorphReader() {
-    super("Metamorph STK", new String[] {"stk", "nd"});
+    super("Metamorph STK", new String[] {"stk", "nd", "tif", "tiff"});
     domains = new String[] {FormatTools.LM_DOMAIN};
+    suffixSufficient = false;
   }
 
   // -- IFormatReader API methods --
+
+  /* @see loci.formats.IFormatReader#isThisType(String, boolean) */
+  public boolean isThisType(String name, boolean open) {
+    if (checkSuffix(name, "nd")) return true;
+    return super.isThisType(name, open);
+  }
+
+  /* @see loci.formats.IFormatReader#isThisType(RandomAccessInputStream) */
+  public boolean isThisType(RandomAccessInputStream stream) throws IOException {
+    TiffParser tp = new TiffParser(stream);
+    IFD ifd = tp.getFirstIFD();
+    if (ifd == null) return false;
+    if (ifd.containsKey(METAMORPH_ID)) return true;
+    String software = ifd.getIFDTextValue(IFD.SOFTWARE);
+    return software != null && software.trim().startsWith("Meta");
+  }
 
   /* @see loci.formats.IFormatReader#isSingleFile(String) */