#617 BigTIFF write support.

imageio/imageio-metadata/src/main/java/com/twelvemonkeys/imageio/metadata/tiff/TIFFWriter.java

@@ -40,7 +40,6 @@ import javax.imageio.IIOException;
 import javax.imageio.stream.ImageOutputStream;
 import java.io.IOException;
 import java.nio.ByteOrder;
-import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.util.*;
 
@@ -58,7 +57,24 @@ public final class TIFFWriter extends MetadataWriter {
 
     private static final int WORD_LENGTH = 2;
     private static final int LONGWORD_LENGTH = 4;
-    private static final int ENTRY_LENGTH = 12;
+
+    // TODO: We probably want to gloss over client code writing IFDs in BigTIFF (or vice versa) somehow... Silently convert IFD -> IFD8
+    private final boolean longOffsets;
+    private final int offsetSize;
+    private final long entryLength;
+    private final int directoryCountLength;
+
+    public TIFFWriter() {
+        this(LONGWORD_LENGTH);
+    }
+
+    public TIFFWriter(int offsetSize) {
+        this.offsetSize = Validate.isTrue(offsetSize == 4 || offsetSize == 8, offsetSize, "offsetSize must be 4 for TIFF or 8 for BigTIFF");
+
+        longOffsets = offsetSize == 8;
+        directoryCountLength = longOffsets ? 8 : WORD_LENGTH;
+        entryLength = 2 * WORD_LENGTH + 2 * offsetSize;
+    }
 
     public boolean write(final Collection<? extends Entry> entries, final ImageOutputStream stream) throws IOException {
         return write(new IFD(entries), stream);
@@ -87,7 +103,7 @@ public final class TIFFWriter extends MetadataWriter {
         }
 
         // Offset to next IFD (EOF)
-        stream.writeInt(0);
+        writeOffset(stream, 0);
 
         return true;
     }
@@ -96,7 +112,12 @@ public final class TIFFWriter extends MetadataWriter {
         // Header
         ByteOrder byteOrder = stream.getByteOrder();
         stream.writeShort(byteOrder == ByteOrder.BIG_ENDIAN ? TIFF.BYTE_ORDER_MARK_BIG_ENDIAN : TIFF.BYTE_ORDER_MARK_LITTLE_ENDIAN);
-        stream.writeShort(42);
+        stream.writeShort(longOffsets ? TIFF.BIGTIFF_MAGIC : TIFF.TIFF_MAGIC);
+
+        if (longOffsets) {
+            stream.writeShort(offsetSize); // Always 8 in this case
+            stream.writeShort(0);
+        }
     }
 
     public long writeIFD(final Collection<Entry> entries, final ImageOutputStream stream) throws IOException {
@@ -118,37 +139,42 @@ public final class TIFFWriter extends MetadataWriter {
         long dataSize = computeDataSize(ordered);
 
         // Offset to this IFD
-        final long ifdOffset = stream.getStreamPosition() + dataSize + LONGWORD_LENGTH;
+        final long ifdOffset = stream.getStreamPosition() + dataSize + offsetSize;
 
         if (!isSubIFD) {
-            stream.writeInt(assertIntegerOffset(ifdOffset));
-            dataOffset += LONGWORD_LENGTH;
+            writeOffset(stream, ifdOffset);
+            dataOffset += offsetSize;
 
             // Seek to offset
             stream.seek(ifdOffset);
         }
         else {
-            dataOffset += WORD_LENGTH + ordered.size() * ENTRY_LENGTH;
+            dataOffset += directoryCountLength + ordered.size() * entryLength;
         }
 
         // Write directory
-        stream.writeShort(ordered.size());
+        writeDirectoryCount(stream, ordered.size());
 
         for (Entry entry : ordered) {
-            // Write tag id
+            // Write tag id, type & value count
             stream.writeShort((Integer) entry.getIdentifier());
-            // Write tag type
             stream.writeShort(getType(entry));
-            // Write value count
-            stream.writeInt(getCount(entry));
+            writeValueCount(stream, getCount(entry));
 
             // Write value
-            if (entry.getValue() instanceof Directory) {
-                // TODO: This could possibly be a compound directory, in which case the count should be > 1
-                stream.writeInt(assertIntegerOffset(dataOffset));
-                long streamPosition = stream.getStreamPosition();
+            Object value = entry.getValue();
+            if (value instanceof Directory) {
+                if (value instanceof CompoundDirectory) {
+                    // Can't have both nested and linked IFDs
+                    throw new AssertionError("SubIFD cannot contain linked IFDs");
+                }
+
+                // We can't write offset here, we need to write value, as both LONG/IFD and LONG8/IFD8 is allowed
+                // TODO: Or possibly gloss over, by always writing IFD8 for BigTIFF?
+                long streamPosition = stream.getStreamPosition() + offsetSize;
+                writeValueInline(dataOffset, getType(entry), stream);
                 stream.seek(dataOffset);
-                Directory subIFD = (Directory) entry.getValue();
+                Directory subIFD = (Directory) value;
                 writeIFD(subIFD, stream, true);
                 dataOffset += computeDataSize(subIFD);
                 stream.seek(streamPosition);
@@ -161,8 +187,26 @@ public final class TIFFWriter extends MetadataWriter {
         return ifdOffset;
     }
 
-    public long computeIFDSize(final Collection<Entry> directory) {
-        return WORD_LENGTH + computeDataSize(new IFD(directory)) + directory.size() * ENTRY_LENGTH;
+    private void writeDirectoryCount(ImageOutputStream stream, int count) throws IOException {
+        if (longOffsets) {
+            stream.writeLong(count);
+        }
+        else {
+            stream.writeShort(count);
+        }
+    }
+
+    private void writeValueCount(ImageOutputStream stream, int count) throws IOException {
+        if (longOffsets) {
+            stream.writeLong(count);
+        }
+        else {
+            stream.writeInt(count);
+        }
+    }
+
+    public long computeIFDSize(final Collection<? extends Entry> directory) {
+        return directoryCountLength + computeDataSize(new IFD(directory)) + directory.size() * entryLength;
     }
 
     private long computeDataSize(final Directory directory) {
@@ -175,13 +219,13 @@ public final class TIFFWriter extends MetadataWriter {
                 throw new IllegalArgumentException(String.format("Unknown size for entry %s", entry));
             }
 
-            if (length > LONGWORD_LENGTH) {
+            if (length > offsetSize) {
                 dataSize += length;
             }
 
             if (entry.getValue() instanceof Directory) {
                 Directory subIFD = (Directory) entry.getValue();
-                long subIFDSize = WORD_LENGTH + subIFD.size() * ENTRY_LENGTH + computeDataSize(subIFD);
+                long subIFDSize = directoryCountLength + computeDataSize(subIFD) + subIFD.size() * entryLength;
                 dataSize += subIFDSize;
             }
         }
@@ -229,11 +273,11 @@ public final class TIFFWriter extends MetadataWriter {
         short type = getType(entry);
         long valueLength = getValueLength(type, getCount(entry));
 
-        if (valueLength <= LONGWORD_LENGTH) {
+        if (valueLength <= offsetSize) {
             writeValueInline(entry.getValue(), type, stream);
 
             // Pad
-            for (long i = valueLength; i < LONGWORD_LENGTH; i++) {
+            for (long i = valueLength; i < offsetSize; i++) {
                 stream.write(0);
             }
 
@@ -248,7 +292,7 @@ public final class TIFFWriter extends MetadataWriter {
 
     private int getCount(final Entry entry) {
         Object value = entry.getValue();
-        return value instanceof String ? ((String) value).getBytes(Charset.forName("UTF-8")).length + 1 : entry.valueCount();
+        return value instanceof String ? ((String) value).getBytes(StandardCharsets.UTF_8).length + 1 : entry.valueCount();
     }
 
     private void writeValueInline(final Object value, final short type, final ImageOutputStream stream) throws IOException {
@@ -344,12 +388,28 @@ public final class TIFFWriter extends MetadataWriter {
                         doubles = (double[]) value;
                     }
                     else {
-                        throw new IllegalArgumentException("Unsupported type for TIFF FLOAT: " + value.getClass());
+                        throw new IllegalArgumentException("Unsupported type for TIFF DOUBLE: " + value.getClass());
                     }
 
                     stream.writeDoubles(doubles, 0, doubles.length);
 
                     break;
+                case TIFF.TYPE_LONG8:
+                case TIFF.TYPE_SLONG8:
+                    if (longOffsets) {
+                        long[] longs;
+
+                        if (value instanceof long[]) {
+                            longs = (long[]) value;
+                        }
+                        else {
+                            throw new IllegalArgumentException("Unsupported type for TIFF LONG8: " + value.getClass());
+                        }
+
+                        stream.writeLongs(longs, 0, longs.length);
+
+                        break;
+                    }
 
                 default:
                     throw new IllegalArgumentException("Unsupported TIFF type: " + type);
@@ -373,6 +433,7 @@ public final class TIFFWriter extends MetadataWriter {
                     break;
                 case TIFF.TYPE_LONG:
                 case TIFF.TYPE_SLONG:
+                case TIFF.TYPE_IFD:
                     stream.writeInt(((Number) value).intValue());
                     break;
                 case TIFF.TYPE_RATIONAL:
@@ -387,6 +448,13 @@ public final class TIFFWriter extends MetadataWriter {
                 case TIFF.TYPE_DOUBLE:
                     stream.writeDouble(((Number) value).doubleValue());
                     break;
+                case TIFF.TYPE_LONG8:
+                case TIFF.TYPE_SLONG8:
+                case TIFF.TYPE_IFD8:
+                    if (longOffsets) {
+                        stream.writeLong(((Number) value).longValue());
+                        break;
+                    }
 
                 default:
                     throw new IllegalArgumentException("Unsupported TIFF type: " + type);
@@ -395,18 +463,39 @@ public final class TIFFWriter extends MetadataWriter {
     }
 
     private void writeValueAt(final long dataOffset, final Object value, final short type, final ImageOutputStream stream) throws IOException {
-        stream.writeInt(assertIntegerOffset(dataOffset));
+        writeOffset(stream, dataOffset);
         long position = stream.getStreamPosition();
         stream.seek(dataOffset);
         writeValueInline(value, type, stream);
         stream.seek(position);
     }
 
-    private int assertIntegerOffset(long offset) throws IIOException {
-        if (offset > Integer.MAX_VALUE - (long) Integer.MIN_VALUE) {
+    public void writeOffset(final ImageOutputStream output, long offset) throws IOException {
+        if (longOffsets) {
+            output.writeLong(assertLongOffset(offset));
+        }
+        else {
+            output.writeInt(assertIntegerOffset(offset)); // Treated as unsigned
+        }
+    }
+
+    public int offsetSize() {
+        return offsetSize;
+    }
+
+    private int assertIntegerOffset(final long offset) throws IIOException {
+        if (offset < 0 || offset > Integer.MAX_VALUE - (long) Integer.MIN_VALUE) {
             throw new IIOException("Integer overflow for TIFF stream");
         }
 
         return (int) offset;
     }
+
+    private long assertLongOffset(final long offset) throws IIOException {
+        if (offset < 0) {
+            throw new IIOException("Long overflow for BigTIFF stream");
+        }
+
+        return offset;
+    }
 }

imageio/imageio-metadata/src/test/java/com/twelvemonkeys/imageio/metadata/tiff/BigTIFFWriterTest.java

@@ -0,0 +1,345 @@
+/*
+ * Copyright (c) 2013, Harald Kuhr
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright notice, this
+ *   list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright notice,
+ *   this list of conditions and the following disclaimer in the documentation
+ *   and/or other materials provided with the distribution.
+ *
+ * * Neither the name of the copyright holder nor the names of its
+ *   contributors may be used to endorse or promote products derived from
+ *   this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package com.twelvemonkeys.imageio.metadata.tiff;
+
+import com.twelvemonkeys.imageio.metadata.*;
+import com.twelvemonkeys.imageio.stream.ByteArrayImageInputStream;
+import com.twelvemonkeys.io.FastByteArrayOutputStream;
+
+import org.junit.Test;
+
+import javax.imageio.ImageIO;
+import javax.imageio.stream.ImageOutputStream;
+import javax.imageio.stream.ImageOutputStreamImpl;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.ByteOrder;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+/**
+ * TIFFWriterTest
+ *
+ * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
+ * @author last modified by $Author: haraldk$
+ * @version $Id: TIFFWriterTest.java,v 1.0 18.07.13 09:53 haraldk Exp$
+ */
+public class BigTIFFWriterTest extends MetadataWriterAbstractTest {
+
+    @Override
+    protected InputStream getData() throws IOException {
+        // TODO: Replace with BigTIFF resource
+        return getResource("/exif/exif-jpeg-segment.bin").openStream();
+    }
+
+    protected TIFFReader createReader() {
+        return new TIFFReader();
+    }
+
+    @Override
+    protected TIFFWriter createWriter() {
+        return new TIFFWriter(8);
+    }
+
+    @Test
+    public void testWriteReadSimple() throws IOException {
+        ArrayList<Entry> entries = new ArrayList<>();
+        entries.add(new TIFFEntry(TIFF.TAG_ORIENTATION, TIFF.TYPE_SHORT, 1));
+        entries.add(new TIFFEntry(TIFF.TAG_IMAGE_WIDTH, TIFF.TYPE_SHORT, 1600));
+        entries.add(new AbstractEntry(TIFF.TAG_IMAGE_HEIGHT, 900) {});
+        entries.add(new TIFFEntry(TIFF.TAG_ARTIST, TIFF.TYPE_ASCII, "Harald K."));
+        entries.add(new AbstractEntry(TIFF.TAG_SOFTWARE, "TwelveMonkeys ImageIO") {});
+        Directory directory = new AbstractDirectory(entries) {};
+
+        ByteArrayOutputStream output = new FastByteArrayOutputStream(1024);
+        ImageOutputStream imageStream = ImageIO.createImageOutputStream(output);
+        createWriter().write(directory, imageStream);
+        imageStream.flush();
+
+        assertEquals(output.size(), imageStream.getStreamPosition());
+
+        byte[] data = output.toByteArray();
+
+        assertEquals(164, data.length);
+        assertEquals('M', data[0]);
+        assertEquals('M', data[1]);
+        assertEquals(0, data[2]);
+        assertEquals(43, data[3]);
+
+        Directory read = createReader().read(new ByteArrayImageInputStream(data));
+
+        assertNotNull(read);
+        assertEquals(5, read.size());
+
+        // TODO: Assert that the tags are written in ascending order (don't test the read directory, but the file structure)!
+
+        assertNotNull(read.getEntryById(TIFF.TAG_SOFTWARE));
+        assertEquals("TwelveMonkeys ImageIO", read.getEntryById(TIFF.TAG_SOFTWARE).getValue());
+
+        assertNotNull(read.getEntryById(TIFF.TAG_IMAGE_WIDTH));
+        assertEquals(1600, read.getEntryById(TIFF.TAG_IMAGE_WIDTH).getValue());
+
+        assertNotNull(read.getEntryById(TIFF.TAG_IMAGE_HEIGHT));
+        assertEquals(900, read.getEntryById(TIFF.TAG_IMAGE_HEIGHT).getValue());
+
+        assertNotNull(read.getEntryById(TIFF.TAG_ORIENTATION));
+        assertEquals(1, read.getEntryById(TIFF.TAG_ORIENTATION).getValue());
+
+        assertNotNull(read.getEntryById(TIFF.TAG_ARTIST));
+        assertEquals("Harald K.", read.getEntryById(TIFF.TAG_ARTIST).getValue());
+    }
+
+    @Test
+    public void testWriteMotorola() throws IOException {
+        ArrayList<Entry> entries = new ArrayList<>();
+        entries.add(new AbstractEntry(TIFF.TAG_SOFTWARE, "TwelveMonkeys ImageIO") {});
+        entries.add(new TIFFEntry(TIFF.TAG_IMAGE_WIDTH, TIFF.TYPE_LONG, Integer.MAX_VALUE));
+        Directory directory = new AbstractDirectory(entries) {};
+
+        ByteArrayOutputStream output = new FastByteArrayOutputStream(1024);
+        ImageOutputStream imageStream = ImageIO.createImageOutputStream(output);
+
+        imageStream.setByteOrder(ByteOrder.BIG_ENDIAN); // BE = Motorola
+
+        createWriter().write(directory, imageStream);
+        imageStream.flush();
+
+        assertEquals(output.size(), imageStream.getStreamPosition());
+
+        byte[] data = output.toByteArray();
+
+        assertEquals(94, data.length);
+        assertEquals('M', data[0]);
+        assertEquals('M', data[1]);
+        assertEquals(0, data[2]);
+        assertEquals(43, data[3]);
+
+        Directory read = new TIFFReader().read(new ByteArrayImageInputStream(data));
+
+        assertNotNull(read);
+        assertEquals(2, read.size());
+        assertNotNull(read.getEntryById(TIFF.TAG_SOFTWARE));
+        assertEquals("TwelveMonkeys ImageIO", read.getEntryById(TIFF.TAG_SOFTWARE).getValue());
+        assertNotNull(read.getEntryById(TIFF.TAG_IMAGE_WIDTH));
+        assertEquals((long) Integer.MAX_VALUE, read.getEntryById(TIFF.TAG_IMAGE_WIDTH).getValue());
+    }
+
+    @Test
+    public void testWriteIntel() throws IOException {
+        ArrayList<Entry> entries = new ArrayList<>();
+        entries.add(new AbstractEntry(TIFF.TAG_SOFTWARE, "TwelveMonkeys ImageIO") {});
+        entries.add(new TIFFEntry(TIFF.TAG_IMAGE_WIDTH, TIFF.TYPE_LONG, Integer.MAX_VALUE));
+        Directory directory = new AbstractDirectory(entries) {};
+
+        ByteArrayOutputStream output = new FastByteArrayOutputStream(1024);
+        ImageOutputStream imageStream = ImageIO.createImageOutputStream(output);
+
+        imageStream.setByteOrder(ByteOrder.LITTLE_ENDIAN); // LE = Intel
+
+        createWriter().write(directory, imageStream);
+        imageStream.flush();
+
+        assertEquals(output.size(), imageStream.getStreamPosition());
+
+        byte[] data = output.toByteArray();
+
+        assertEquals(94, data.length);
+        assertEquals('I', data[0]);
+        assertEquals('I', data[1]);
+        assertEquals(43, data[2]);
+        assertEquals(0, data[3]);
+
+        Directory read = new TIFFReader().read(new ByteArrayImageInputStream(data));
+
+        assertNotNull(read);
+        assertEquals(2, read.size());
+        assertNotNull(read.getEntryById(TIFF.TAG_SOFTWARE));
+        assertEquals("TwelveMonkeys ImageIO", read.getEntryById(TIFF.TAG_SOFTWARE).getValue());
+        assertNotNull(read.getEntryById(TIFF.TAG_IMAGE_WIDTH));
+        assertEquals((long) Integer.MAX_VALUE, read.getEntryById(TIFF.TAG_IMAGE_WIDTH).getValue());
+    }
+
+    @Test
+    public void testNestingIFD8Long8() throws IOException {
+        TIFFEntry artist = new TIFFEntry(TIFF.TAG_SOFTWARE, TIFF.TYPE_ASCII, "TwelveMonkeys ImageIO");
+
+        TIFFEntry subSubSubSubIFD = new TIFFEntry(TIFF.TAG_SUB_IFD, TIFF.TYPE_IFD8, new IFD(Collections.singletonList(artist)));
+        TIFFEntry subSubSubIFD = new TIFFEntry(TIFF.TAG_SUB_IFD, TIFF.TYPE_LONG8, new IFD(Collections.singletonList(subSubSubSubIFD)));
+        TIFFEntry subSubIFD = new TIFFEntry(TIFF.TAG_SUB_IFD, TIFF.TYPE_LONG8, new IFD(Collections.singletonList(subSubSubIFD)));
+        TIFFEntry subIFD = new TIFFEntry(TIFF.TAG_SUB_IFD, TIFF.TYPE_IFD8, new IFD(Collections.singletonList(subSubIFD)));
+
+        Directory directory = new IFD(Collections.<Entry>singletonList(subIFD));
+
+        ByteArrayOutputStream output = new FastByteArrayOutputStream(1024);
+        ImageOutputStream imageStream = ImageIO.createImageOutputStream(output);
+
+        createWriter().write(directory, imageStream);
+        imageStream.flush();
+
+        assertEquals(output.size(), imageStream.getStreamPosition());
+
+        Directory read = new TIFFReader().read(new ByteArrayImageInputStream(output.toByteArray()));
+
+        assertNotNull(read);
+        assertEquals(1, read.size());
+        assertEquals(subIFD, read.getEntryById(TIFF.TAG_SUB_IFD)); // Recursively tests content!
+    }
+
+    @Test
+    public void testNestingIFDLong() throws IOException {
+        TIFFEntry artist = new TIFFEntry(TIFF.TAG_SOFTWARE, TIFF.TYPE_ASCII, "TwelveMonkeys ImageIO");
+
+        TIFFEntry subSubSubSubIFD = new TIFFEntry(TIFF.TAG_SUB_IFD, TIFF.TYPE_IFD, new IFD(Collections.singletonList(artist)));
+        TIFFEntry subSubSubIFD = new TIFFEntry(TIFF.TAG_SUB_IFD, TIFF.TYPE_LONG, new IFD(Collections.singletonList(subSubSubSubIFD)));
+        TIFFEntry subSubIFD = new TIFFEntry(TIFF.TAG_SUB_IFD, TIFF.TYPE_LONG, new IFD(Collections.singletonList(subSubSubIFD)));
+        TIFFEntry subIFD = new TIFFEntry(TIFF.TAG_SUB_IFD, TIFF.TYPE_IFD, new IFD(Collections.singletonList(subSubIFD)));
+
+        Directory directory = new IFD(Collections.<Entry>singletonList(subIFD));
+
+        ByteArrayOutputStream output = new FastByteArrayOutputStream(1024);
+        ImageOutputStream imageStream = ImageIO.createImageOutputStream(output);
+
+        createWriter().write(directory, imageStream);
+        imageStream.flush();
+
+        assertEquals(output.size(), imageStream.getStreamPosition());
+
+        Directory read = new TIFFReader().read(new ByteArrayImageInputStream(output.toByteArray()));
+
+        assertNotNull(read);
+        assertEquals(1, read.size());
+        assertEquals(subIFD, read.getEntryById(TIFF.TAG_SUB_IFD)); // Recursively tests content!
+    }
+
+    @Test
+    public void testReadWriteRead() throws IOException {
+        Directory original = createReader().read(getDataAsIIS());
+
+        ByteArrayOutputStream output = new FastByteArrayOutputStream(256);
+        ImageOutputStream imageOutput = ImageIO.createImageOutputStream(output);
+
+        try {
+            createWriter().write(original, imageOutput);
+        }
+        finally {
+            imageOutput.close();
+        }
+
+        Directory read = createReader().read(new ByteArrayImageInputStream(output.toByteArray()));
+
+        assertEquals(original, read);
+    }
+
+    @Test
+    public void testComputeIFDSize() throws IOException {
+        ArrayList<Entry> entries = new ArrayList<>();
+        entries.add(new TIFFEntry(TIFF.TAG_ORIENTATION, TIFF.TYPE_SHORT, 1));
+        entries.add(new TIFFEntry(TIFF.TAG_IMAGE_WIDTH, TIFF.TYPE_SHORT, 1600));
+        entries.add(new AbstractEntry(TIFF.TAG_IMAGE_HEIGHT, 900) {});
+        entries.add(new TIFFEntry(TIFF.TAG_ARTIST, TIFF.TYPE_ASCII, "Harald K."));
+        entries.add(new AbstractEntry(TIFF.TAG_SOFTWARE, "TwelveMonkeys ImageIO") {});
+
+        TIFFWriter writer = createWriter();
+
+        ImageOutputStream stream = new NullImageOutputStream();
+        writer.writeIFD(entries, stream);
+
+        assertEquals(140, writer.computeIFDSize(entries));
+        assertEquals(148, stream.getStreamPosition());
+    }
+
+    @Test
+    public void testComputeIFDSizeNestedIFD8Long8() throws IOException {
+        TIFFEntry artist = new TIFFEntry(TIFF.TAG_SOFTWARE, TIFF.TYPE_ASCII, "TwelveMonkeys ImageIO");
+
+        TIFFEntry subSubSubSubIFD = new TIFFEntry(TIFF.TAG_SUB_IFD, TIFF.TYPE_IFD8, new IFD(Collections.singletonList(artist)));
+        TIFFEntry subSubSubIFD = new TIFFEntry(TIFF.TAG_SUB_IFD, TIFF.TYPE_LONG8, new IFD(Collections.singletonList(subSubSubSubIFD)));
+        TIFFEntry subSubIFD = new TIFFEntry(TIFF.TAG_SUB_IFD, TIFF.TYPE_LONG8, new IFD(Collections.singletonList(subSubSubIFD)));
+        TIFFEntry subIFD = new TIFFEntry(TIFF.TAG_SUB_IFD, TIFF.TYPE_IFD8, new IFD(Collections.singletonList(subSubIFD)));
+
+        List<Entry> entries = Collections.<Entry>singletonList(subIFD);
+
+        TIFFWriter writer = createWriter();
+
+        ImageOutputStream stream = new NullImageOutputStream();
+        writer.writeIFD(entries, stream);
+
+        assertEquals(162, writer.computeIFDSize(entries));
+        assertEquals(170, stream.getStreamPosition());
+    }
+
+    @Test
+    public void testComputeIFDSizeNestedIFDLong() throws IOException {
+        TIFFEntry artist = new TIFFEntry(TIFF.TAG_SOFTWARE, TIFF.TYPE_ASCII, "TwelveMonkeys ImageIO");
+
+        TIFFEntry subSubSubSubIFD = new TIFFEntry(TIFF.TAG_SUB_IFD, TIFF.TYPE_IFD, new IFD(Collections.singletonList(artist)));
+        TIFFEntry subSubSubIFD = new TIFFEntry(TIFF.TAG_SUB_IFD, TIFF.TYPE_LONG, new IFD(Collections.singletonList(subSubSubSubIFD)));
+        TIFFEntry subSubIFD = new TIFFEntry(TIFF.TAG_SUB_IFD, TIFF.TYPE_LONG, new IFD(Collections.singletonList(subSubSubIFD)));
+        TIFFEntry subIFD = new TIFFEntry(TIFF.TAG_SUB_IFD, TIFF.TYPE_IFD, new IFD(Collections.singletonList(subSubIFD)));
+
+        List<Entry> entries = Collections.<Entry>singletonList(subIFD);
+
+        TIFFWriter writer = createWriter();
+
+        ImageOutputStream stream = new NullImageOutputStream();
+        writer.writeIFD(entries, stream);
+
+        assertEquals(162, writer.computeIFDSize(entries)); // 162 = 5 * (8 + 20) + 22
+        assertEquals(170, stream.getStreamPosition()); // 170 = 8 + 5 * (8 + 20) + 22
+    }
+
+    private static class NullImageOutputStream extends ImageOutputStreamImpl {
+        @Override
+        public void write(int b) throws IOException {
+            streamPos++;
+        }
+
+        @Override
+        public void write(byte[] b, int off, int len) throws IOException {
+            streamPos += len;
+        }
+
+        @Override
+        public int read() throws IOException {
+            throw new UnsupportedOperationException("Method read not implemented");
+        }
+
+        @Override
+        public int read(byte[] b, int off, int len) throws IOException {
+            throw new UnsupportedOperationException("Method read not implemented");
+        }
+    }
+}

imageio/imageio-metadata/src/test/java/com/twelvemonkeys/imageio/metadata/tiff/TIFFWriterTest.java

@@ -33,6 +33,7 @@ package com.twelvemonkeys.imageio.metadata.tiff;
 import com.twelvemonkeys.imageio.metadata.*;
 import com.twelvemonkeys.imageio.stream.ByteArrayImageInputStream;
 import com.twelvemonkeys.io.FastByteArrayOutputStream;
+
 import org.junit.Test;
 
 import javax.imageio.ImageIO;
@@ -84,7 +85,7 @@ public class TIFFWriterTest extends MetadataWriterAbstractTest {
 
         ByteArrayOutputStream output = new FastByteArrayOutputStream(1024);
         ImageOutputStream imageStream = ImageIO.createImageOutputStream(output);
-        new TIFFWriter().write(directory, imageStream);
+        createWriter().write(directory, imageStream);
         imageStream.flush();
 
         assertEquals(output.size(), imageStream.getStreamPosition());
@@ -132,7 +133,7 @@ public class TIFFWriterTest extends MetadataWriterAbstractTest {
 
         imageStream.setByteOrder(ByteOrder.BIG_ENDIAN); // BE = Motorola
 
-        new TIFFWriter().write(directory, imageStream);
+        createWriter().write(directory, imageStream);
         imageStream.flush();
 
         assertEquals(output.size(), imageStream.getStreamPosition());
@@ -167,7 +168,7 @@ public class TIFFWriterTest extends MetadataWriterAbstractTest {
 
         imageStream.setByteOrder(ByteOrder.LITTLE_ENDIAN); // LE = Intel
 
-        new TIFFWriter().write(directory, imageStream);
+        createWriter().write(directory, imageStream);
         imageStream.flush();
 
         assertEquals(output.size(), imageStream.getStreamPosition());
@@ -204,7 +205,7 @@ public class TIFFWriterTest extends MetadataWriterAbstractTest {
         ByteArrayOutputStream output = new FastByteArrayOutputStream(1024);
         ImageOutputStream imageStream = ImageIO.createImageOutputStream(output);
 
-        new TIFFWriter().write(directory, imageStream);
+        createWriter().write(directory, imageStream);
         imageStream.flush();
 
         assertEquals(output.size(), imageStream.getStreamPosition());
@@ -247,9 +248,10 @@ public class TIFFWriterTest extends MetadataWriterAbstractTest {
         TIFFWriter writer = createWriter();
 
         ImageOutputStream stream = new NullImageOutputStream();
-        writer.write(new IFD(entries), stream);
+        writer.writeIFD(entries, stream);
 
-        assertEquals(stream.getStreamPosition(), writer.computeIFDSize(entries) + 12);
+        assertEquals(94, writer.computeIFDSize(entries));
+        assertEquals(98, stream.getStreamPosition());
     }
 
     @Test
@@ -266,9 +268,10 @@ public class TIFFWriterTest extends MetadataWriterAbstractTest {
         TIFFWriter writer = createWriter();
 
         ImageOutputStream stream = new NullImageOutputStream();
-        writer.write(new IFD(entries), stream);
+        writer.writeIFD(entries, stream);
 
-        assertEquals(stream.getStreamPosition(), writer.computeIFDSize(entries) + 12);
+        assertEquals(92, writer.computeIFDSize(entries)); // 92 = 5 * (2 + 12) + 22
+        assertEquals(96, stream.getStreamPosition()); // 96 = 4 + 5 * (2 + 12) + 22
     }
 
     private static class NullImageOutputStream extends ImageOutputStreamImpl {