8152966: ClassCastException when adding IFD to the TIFFDirectory before the image write
Summary: Move the private method getDirectoryAsIFD(TIFFDirectory) from the API class TIFFDirectory to a public method in the internal class TIFFIFD and replace all casts of TIFFDirectory to TIFFIFD with its invocation
Reviewed-by: prr
--- a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFIFD.java Fri Aug 12 20:36:41 2016 +0300
+++ b/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFIFD.java Fri Aug 12 14:35:56 2016 -0700
@@ -49,6 +49,45 @@
private long stripOrTileOffsetsPosition = -1;
private long lastPosition = -1;
+
+ /**
+ * Converts a {@code TIFFDirectory} to a {@code TIFFIFD}.
+ */
+ public static TIFFIFD getDirectoryAsIFD(TIFFDirectory dir) {
+ if(dir instanceof TIFFIFD) {
+ return (TIFFIFD)dir;
+ }
+
+ TIFFIFD ifd = new TIFFIFD(Arrays.asList(dir.getTagSets()),
+ dir.getParentTag());
+ TIFFField[] fields = dir.getTIFFFields();
+ int numFields = fields.length;
+ for(int i = 0; i < numFields; i++) {
+ TIFFField f = fields[i];
+ TIFFTag tag = f.getTag();
+ if(tag.isIFDPointer()) {
+ TIFFDirectory subDir = null;
+ if (f.hasDirectory()) {
+ subDir = f.getDirectory();
+ } else if (f.getData() instanceof TIFFDirectory) {
+ subDir = (TIFFDirectory)f.getData();
+ }
+ if (subDir != null) {
+ TIFFDirectory subIFD = getDirectoryAsIFD(subDir);
+ f = new TIFFField(tag, f.getType(), (long)f.getCount(),
+ subIFD);
+ } else {
+ f = null;
+ }
+ }
+ if (f != null) {
+ ifd.addTIFFField(f);
+ }
+ }
+
+ return ifd;
+ }
+
public static TIFFTag getTag(int tagNumber, List<TIFFTagSet> tagSets) {
Iterator<TIFFTagSet> iter = tagSets.iterator();
while (iter.hasNext()) {
@@ -704,7 +743,7 @@
pos = nextSpace;
if (tag.isIFDPointer() && f.hasDirectory()) {
- TIFFIFD subIFD = (TIFFIFD)f.getDirectory();
+ TIFFIFD subIFD = getDirectoryAsIFD(f.getDirectory());
subIFD.writeToStream(stream);
nextSpace = subIFD.lastPosition;
} else {
--- a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFImageMetadata.java Fri Aug 12 20:36:41 2016 +0300
+++ b/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFImageMetadata.java Fri Aug 12 14:35:56 2016 -0700
@@ -132,7 +132,7 @@
if (tag == null) {
node = f.getAsNativeNode();
} else if (tag.isIFDPointer() && f.hasDirectory()) {
- TIFFIFD subIFD = (TIFFIFD)f.getDirectory();
+ TIFFIFD subIFD = TIFFIFD.getDirectoryAsIFD(f.getDirectory());
// Recurse
node = getIFDAsTree(subIFD, tag.getName(), tag.getNumber());
--- a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFImageWriter.java Fri Aug 12 20:36:41 2016 +0300
+++ b/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFImageWriter.java Fri Aug 12 14:35:56 2016 -0700
@@ -1478,7 +1478,7 @@
(ExifParentTIFFTagSet.TAG_EXIF_IFD_POINTER);
if(f != null && f.hasDirectory()) {
// Retrieve the Exif IFD.
- exifIFD = (TIFFIFD)f.getDirectory();
+ exifIFD = TIFFIFD.getDirectoryAsIFD(f.getDirectory());
} else if(isPrimaryIFD) {
// Create the Exif IFD.
List<TIFFTagSet> exifTagSets = new ArrayList<TIFFTagSet>(1);
--- a/jdk/src/java.desktop/share/classes/javax/imageio/plugins/tiff/TIFFDirectory.java Fri Aug 12 20:36:41 2016 +0300
+++ b/jdk/src/java.desktop/share/classes/javax/imageio/plugins/tiff/TIFFDirectory.java Fri Aug 12 14:35:56 2016 -0700
@@ -204,44 +204,6 @@
}
/**
- * Converts a {@code TIFFDirectory} to a {@code TIFFIFD}.
- */
- private static TIFFIFD getDirectoryAsIFD(TIFFDirectory dir) {
- if(dir instanceof TIFFIFD) {
- return (TIFFIFD)dir;
- }
-
- TIFFIFD ifd = new TIFFIFD(Arrays.asList(dir.getTagSets()),
- dir.getParentTag());
- TIFFField[] fields = dir.getTIFFFields();
- int numFields = fields.length;
- for(int i = 0; i < numFields; i++) {
- TIFFField f = fields[i];
- TIFFTag tag = f.getTag();
- if(tag.isIFDPointer()) {
- TIFFDirectory subDir = null;
- if (f.hasDirectory()) {
- subDir = f.getDirectory();
- } else if (f.getData() instanceof TIFFDirectory) {
- subDir = (TIFFDirectory)f.getData();
- }
- if (subDir != null) {
- TIFFDirectory subIFD = getDirectoryAsIFD(subDir);
- f = new TIFFField(tag, f.getType(), (long)f.getCount(),
- subIFD);
- } else {
- f = null;
- }
- }
- if (f != null) {
- ifd.addTIFFField(f);
- }
- }
-
- return ifd;
- }
-
- /**
* Constructs a {@code TIFFDirectory} which is aware of a given
* group of {@link TIFFTagSet}s. An optional parent {@link TIFFTag}
* may also be specified.
@@ -459,7 +421,7 @@
* {@code TIFFDirectory}.
*/
public IIOMetadata getAsMetadata() {
- return new TIFFImageMetadata(getDirectoryAsIFD(this));
+ return new TIFFImageMetadata(TIFFIFD.getDirectoryAsIFD(this));
}
/**
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/test/javax/imageio/plugins/tiff/IFDTest.java Fri Aug 12 14:35:56 2016 -0700
@@ -0,0 +1,99 @@
+/*
+ * Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/**
+ * @test
+ * @bug 8152966
+ * @summary Verify that casting of TIFFDirectory to TIFFIFD has been fixed.
+ */
+
+import java.awt.Color;
+import java.awt.Graphics;
+import java.awt.image.BufferedImage;
+import java.io.*;
+import javax.imageio.*;
+import javax.imageio.metadata.*;
+import javax.imageio.stream.*;
+
+
+import javax.imageio.plugins.tiff.*;
+
+
+public class IFDTest {
+
+ private ImageWriter getTIFFWriter() {
+
+ java.util.Iterator<ImageWriter> writers =
+ ImageIO.getImageWritersByFormatName("TIFF");
+ if (!writers.hasNext()) {
+ throw new RuntimeException("No readers available for TIFF format");
+ }
+ return writers.next();
+ }
+
+ private void writeImage() throws Exception {
+
+ File file = File.createTempFile("IFDTest", "tif", new File("."));
+ file.deleteOnExit();
+
+ OutputStream s = new BufferedOutputStream(
+ new FileOutputStream("test.tiff"));
+ try (ImageOutputStream ios = ImageIO.createImageOutputStream(s)) {
+
+ ImageWriter writer = getTIFFWriter();
+ writer.setOutput(ios);
+
+ BufferedImage img = new BufferedImage(20, 20, BufferedImage.TYPE_INT_RGB);
+ Graphics g = img.getGraphics();
+ g.setColor(Color.GRAY);
+ g.fillRect(0, 0, 20, 20);
+ g.dispose();
+
+ IIOMetadata metadata = writer.getDefaultImageMetadata(
+ new ImageTypeSpecifier(img), writer.getDefaultWriteParam());
+
+ TIFFDirectory dir = TIFFDirectory.createFromMetadata(metadata);
+
+ int type = TIFFTag.TIFF_IFD_POINTER;
+ int nTag = ExifParentTIFFTagSet.TAG_EXIF_IFD_POINTER;
+ TIFFTag tag = new TIFFTag("Exif IFD", nTag, 1 << type);
+ TIFFTagSet sets[] = {ExifTIFFTagSet.getInstance()};
+
+ TIFFField f = new TIFFField(tag, type, 42L, new TIFFDirectory(sets, tag));
+ dir.addTIFFField(f);
+
+ writer.write(new IIOImage(img, null, dir.getAsMetadata()));
+
+ ios.flush();
+ writer.dispose();
+ } finally {
+ s.close();
+ file.delete();
+ }
+ }
+
+
+ public static void main(String[] args) throws Exception {
+ (new IFDTest()).writeImage();
+ }
+}