diff --git a/components/formats-gpl/src/loci/formats/in/FujiReader.java b/components/formats-gpl/src/loci/formats/in/FujiReader.java index 34eccf1d435..5e981bda1bc 100644 --- a/components/formats-gpl/src/loci/formats/in/FujiReader.java +++ b/components/formats-gpl/src/loci/formats/in/FujiReader.java @@ -142,17 +142,14 @@ public void close(boolean fileOnly) throws IOException { /* @see loci.formats.FormatReader#initFile(String) */ @Override protected void initFile(String id) throws FormatException, IOException { - super.initFile(id); - - if (checkSuffix(id, "inf")) { - infFile = new Location(id).getAbsolutePath(); - pixelsFile = infFile.substring(0, infFile.lastIndexOf(".")) + ".img"; - } - else { - pixelsFile = new Location(id).getAbsolutePath(); - infFile = pixelsFile.substring(0, pixelsFile.lastIndexOf(".")) + ".inf"; + if (!checkSuffix(id, "inf")) { + initFile(id.substring(0, id.lastIndexOf(".")) + ".inf"); + return; } + super.initFile(id); + infFile = new Location(id).getAbsolutePath(); + pixelsFile = infFile.substring(0, infFile.lastIndexOf(".")) + ".img"; String[] lines = DataTools.readFile(infFile).split("\r{0,1}\n"); int bits = Integer.parseInt(lines[5]); diff --git a/components/test-suite/src/loci/tests/testng/FormatReaderTest.java b/components/test-suite/src/loci/tests/testng/FormatReaderTest.java index 083a940e7cc..511ee5e372a 100644 --- a/components/test-suite/src/loci/tests/testng/FormatReaderTest.java +++ b/components/test-suite/src/loci/tests/testng/FormatReaderTest.java @@ -1871,7 +1871,6 @@ public void testSaneUsedFiles() { !(reader.getFormat().equals("Evotec Flex")) && !(reader.getFormat().equals("CellSens VSI")) && !(reader.getFormat().equals("PerkinElmer")) && - !(reader.getFormat().equals("Fuji LAS 3000")) && !(reader.getFormat().equals("Micro-Manager")) && !(reader.getFormat().equals("BDV")) && !(reader.getFormat().equals("Zeiss AxioVision TIFF")) &&