diff --git a/src/test/java/edu/harvard/hul/ois/fits/junit/MixTest.java b/src/test/java/edu/harvard/hul/ois/fits/junit/MixTest.java index ea6a63346..b3e755445 100644 --- a/src/test/java/edu/harvard/hul/ois/fits/junit/MixTest.java +++ b/src/test/java/edu/harvard/hul/ois/fits/junit/MixTest.java @@ -60,6 +60,11 @@ public void testTwoPageTiff() throws Exception { writeOutput("W00EGS1016782-I01JW30--I01JW300001__0001.tif"); } + @Test + public void testPyramidalTiff() throws Exception { + writeOutput("x059f0483-original_file.ptif"); + } + @Test public void testJp2_1() throws Exception { writeOutput("test.jp2"); diff --git a/src/test/java/edu/harvard/hul/ois/fits/junit/MixXmlUnitTest.java b/src/test/java/edu/harvard/hul/ois/fits/junit/MixXmlUnitTest.java index 037b56082..3090c77a4 100644 --- a/src/test/java/edu/harvard/hul/ois/fits/junit/MixXmlUnitTest.java +++ b/src/test/java/edu/harvard/hul/ois/fits/junit/MixXmlUnitTest.java @@ -58,6 +58,11 @@ public void testTwoPageTiff() throws Exception { testFile("W00EGS1016782-I01JW30--I01JW300001__0001.tif"); } + @Test + public void testPyramidalTiff() throws Exception { + testFile("x059f0483-original_file.ptif"); + } + @Test public void testJp2_1() throws Exception { testFile("test.jp2"); diff --git a/src/test/java/edu/harvard/hul/ois/fits/junit/service/MixXmlUnitServiceTest.java b/src/test/java/edu/harvard/hul/ois/fits/junit/service/MixXmlUnitServiceTest.java index 8bd5ff3f6..472335729 100644 --- a/src/test/java/edu/harvard/hul/ois/fits/junit/service/MixXmlUnitServiceTest.java +++ b/src/test/java/edu/harvard/hul/ois/fits/junit/service/MixXmlUnitServiceTest.java @@ -67,6 +67,11 @@ public void testTwoPageTiff() throws Exception { testFileInWebApp("W00EGS1016782-I01JW30--I01JW300001__0001.tif"); } + @Test + public void testPyramidalTiff() throws Exception { + testFileInWebApp("x059f0483-original_file.ptif"); + } + @Test public void testJp2_1() throws Exception { testFileInWebApp("test.jp2"); diff --git a/testfiles/input/x059f0483-original_file.ptif b/testfiles/input/x059f0483-original_file.ptif new file mode 100644 index 000000000..7ab5d3b67 Binary files /dev/null and b/testfiles/input/x059f0483-original_file.ptif differ diff --git a/testfiles/output/x059f0483-original_file.ptif_XmlUnitExpectedOutput.xml b/testfiles/output/x059f0483-original_file.ptif_XmlUnitExpectedOutput.xml new file mode 100644 index 000000000..d19ed8355 --- /dev/null +++ b/testfiles/output/x059f0483-original_file.ptif_XmlUnitExpectedOutput.xml @@ -0,0 +1,215 @@ + + + + + + + + + + + 6.0 + fmt/353 + + + + 12098706 + 2025-07-10T12:08:01 + /fits/testfiles/input/x059f0483-original_file.ptif + x059f0483-original_file.ptif + 1a2ebcd15709baca49e031b75ccc69f1 + 1758811025421 + + + true + true + + + + little endian + little endian + little endian + little endian + little endian + little endian + little endian + Unknown + JPEG + 6164 + 9184 + YCbCr + 0 255 0 255 0 255 0 255 0 255 0 255 0 255 0 255 0 255 0 255 0 255 0 255 0 255 0 255 0 255 0 255 0 255 0 255 0 255 0 255 0 255 + Adobe RGB (1998) Adobe RGB (1998) Adobe RGB (1998) Adobe RGB (1998) Adobe RGB (1998) Adobe RGB (1998) Adobe RGB (1998) + Adobe RGB (1998) + 22 22 22 22 22 22 22 + 299100058710001141000 299100058710001141000 299100058710001141000 299100058710001141000 299100058710001141000 299100058710001141000 299100058710001141000 + Centered + normal* + in. + 400 + 400 + 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 8 + 8 8 8 + 3 3 3 3 3 3 3 + 3 + Flash did not fire + 2.1.0 + FUJIFILM + GFX100S + + + + little endian + + Unknown + + + + + 6164 + 9184 + + YCbCr + + + Adobe RGB (1998) Adobe RGB (1998) Adobe RGB (1998) Adobe RGB (1998) Adobe RGB (1998) Adobe RGB (1998) Adobe RGB (1998) + 2.1.0 + + + + + + + 2147483647 + 100 + + + 2147483647 + 100 + + + 2147483647 + 100 + + + + + + Y + + 25500 + 100 + + + 0 + 100 + + + + Cb + + 25500 + 100 + + + 0 + 100 + + + + Cr + + 25500 + 100 + + + 0 + 100 + + + + + + + + + 2025-07-10T12:08:01 + + + FUJIFILM + + GFX100S + + + + + + + + Flash did not fire + + + + normal* + + + + in. + + 400 + 1 + + + 400 + 1 + + + + + 8 + 8 + 8 + 8 + 8 + 8 + 8 + 8 + 8 + 8 + 8 + 8 + 8 + 8 + 8 + 8 + 8 + 8 + 8 + 8 + 8 + integer + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/xml/exiftool/exiftool_image_to_fits.xslt b/xml/exiftool/exiftool_image_to_fits.xslt index 5a1a89dd9..d10ec824e 100644 --- a/xml/exiftool/exiftool_image_to_fits.xslt +++ b/xml/exiftool/exiftool_image_to_fits.xslt @@ -43,7 +43,7 @@ xmlns:xsl="http://www.w3.org/1999/XSL/Transform"> - + @@ -53,7 +53,7 @@ xmlns:xsl="http://www.w3.org/1999/XSL/Transform"> - + @@ -787,4 +787,4 @@ xmlns:xsl="http://www.w3.org/1999/XSL/Transform"> - \ No newline at end of file +