#342 Initial BigTIFF support

2026-05-01 00:00:02 -04:00 · 2017-08-21 21:59:09 +02:00
parent 3f5f48d8cb
commit 792b531b0e
20 changed files with 499 additions and 44 deletions
@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 2012, 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 "TwelveMonkeys" 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 OWNER 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.plugins.tiff;
+
+import com.twelvemonkeys.imageio.metadata.tiff.TIFF;
+import com.twelvemonkeys.imageio.spi.ImageReaderSpiBase;
+
+import java.io.IOException;
+import java.util.Locale;
+
+/**
+ * BigTIFFImageReaderSpi.
+ * <p/>
+ * This is a separate service provider for the BigTIFF format, to support
+ * special cases where one does not want BigTIFF support.
+ *
+ * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
+ * @author last modified by $Author: haraldk$
+ * @version $Id: BigTIFFImageReaderSpi.java,v 1.0 08.05.12 15:14 haraldk Exp$
+ */
+public final class BigTIFFImageReaderSpi extends ImageReaderSpiBase {
+    /**
+     * Creates a {@code BigTIFFImageReaderSpi}.
+     */
+    public BigTIFFImageReaderSpi() {
+        super(new BigTIFFProviderInfo());
+    }
+
+    public boolean canDecodeInput(final Object pSource) throws IOException {
+        return TIFFImageReaderSpi.canDecodeAs(pSource, TIFF.BIGTIFF_MAGIC);
+    }
+
+    public TIFFImageReader createReaderInstance(final Object pExtension) {
+        return new TIFFImageReader(this);
+    }
+
+    public String getDescription(final Locale pLocale) {
+        return "BigTIFF image reader";
+    }
+}
@@ -0,0 +1,29 @@
+package com.twelvemonkeys.imageio.plugins.tiff;
+
+import com.twelvemonkeys.imageio.spi.ReaderWriterProviderInfo;
+
+/**
+ * BigTIFFProviderInfo.
+ *
+ * @author <a href="mailto:harald.kuhr@gmail.com">Harald Kuhr</a>
+ * @author last modified by $Author: harald.kuhr$
+ * @version $Id: BigTIFFProviderInfo.java,v 1.0 26/04/2017 harald.kuhr Exp$
+ */
+final class BigTIFFProviderInfo extends ReaderWriterProviderInfo {
+    protected BigTIFFProviderInfo() {
+        super(
+                BigTIFFProviderInfo.class,
+                new String[] {"bigtiff", "BigTIFF", "BIGTIFF"},
+                new String[] {"tif", "tiff", "btf", "tf8", "btiff"},
+                new String[] {
+                        "image/tiff", "image/x-tiff"
+                },
+                "com.twelvemonkeys.imageio.plugins.tiff.TIFFImageReader",
+                new String[] {"com.twelvemonkeys.imageio.plugins.tiff.BigTIFFImageReaderSpi"},
+                null,
+                null,
+                false, TIFFStreamMetadata.SUN_NATIVE_STREAM_METADATA_FORMAT_NAME, "com.twelvemonkeys.imageio.plugins.tiff.TIFFStreamMetadataFormat", null, null,
+                true, TIFFMedataFormat.SUN_NATIVE_IMAGE_METADATA_FORMAT_NAME, "com.twelvemonkeys.imageio.plugins.tiff.TIFFMedataFormat", null, null
+        );
+    }
+}
@@ -157,7 +157,7 @@ public final class TIFFImageReader extends ImageReaderBase {
    private CompoundDirectory IFDs;
    private Directory currentIFD;

-    TIFFImageReader(final TIFFImageReaderSpi provider) {
+    TIFFImageReader(final ImageReaderSpi provider) {
        super(provider);
    }

@@ -71,6 +71,10 @@ public final class TIFFImageReaderSpi extends ImageReaderSpiBase {
    }

    public boolean canDecodeInput(final Object pSource) throws IOException {
+        return canDecodeAs(pSource, TIFF.TIFF_MAGIC);
+    }
+
+    static boolean canDecodeAs(final Object pSource, final int magic) throws IOException {
        if (!(pSource instanceof ImageInputStream)) {
            return false;
        }
@@ -95,11 +99,7 @@ public final class TIFFImageReaderSpi extends ImageReaderSpiBase {
                    return false;
                }

-                // TODO: BigTiff uses version 43 instead of TIFF's 42, and header is slightly different, see
-                // http://www.awaresystems.be/imaging/tiff/bigtiff.html
-                int magic = stream.readUnsignedShort();
-
-                return magic == TIFF.TIFF_MAGIC;
+                return stream.readUnsignedShort() == magic;
            }
            finally {
                stream.setByteOrder(originalOrder);
@@ -1 +1,2 @@
 com.twelvemonkeys.imageio.plugins.tiff.TIFFImageReaderSpi
+com.twelvemonkeys.imageio.plugins.tiff.BigTIFFImageReaderSpi