Merge pull request #2220 from bramalingam/rebased/dev_5_1/ome-tiff-ty…

…pe-checking OME-TIFF: make sure BinaryOnly files reference a valid MetadataFile (rebased onto dev_5_1)
ome · Feb 1, 2016 · f43b625 · f43b625
2 parents 3e594c1 + 795e22b
commit f43b625
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/components/formats-bsd/src/loci/formats/in/OMETiffReader.java b/components/formats-bsd/src/loci/formats/in/OMETiffReader.java
@@ -216,7 +216,11 @@ else if (description instanceof String) {
 
       try {
         String metadataFile = meta.getBinaryOnlyMetadataFile();
-        if (metadataFile != null) {
+        // check the suffix to make sure that the MetadataFile is not
+        // referencing the current OME-TIFF
+        if (metadataFile != null && !checkSuffix(metadataFile, "ome.tiff") &&
+          !checkSuffix(metadataFile, "ome.tif"))
+        {
           return true;
         }
       }