diff --git a/imageio/imageio-pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/PICTImageReader.java b/imageio/imageio-pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/PICTImageReader.java index 5ee36c1e..69515421 100644 --- a/imageio/imageio-pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/PICTImageReader.java +++ b/imageio/imageio-pict/src/main/java/com/twelvemonkeys/imageio/plugins/pict/PICTImageReader.java @@ -303,8 +303,16 @@ public final class PICTImageReader extends ImageReaderBase { } if (DEBUG) { System.out.println("bounding rect: " + new Rectangle(x2, y2, w2 - x2, h2 - y2)); + if (frame.x != x2 || frame.y != y2 || frame.width != w2-x2 || frame.height != h2-y2) { + System.out.println("*** replacing old frame " + frame); + } } + frame.x = x2; + frame.y = y2; + frame.width = w2 - x2; + frame.height = h2 - y2; + // long reserved pStream.skipBytes(4); } @@ -2617,7 +2625,7 @@ public final class PICTImageReader extends ImageReaderBase { } Rectangle frame = getPICTFrame(); - BufferedImage image = getDestination(pParam, getImageTypes(pIndex), getXPtCoord(frame.width), getYPtCoord(frame.height)); + BufferedImage image = getDestination(pParam, getImageTypes(pIndex), frame.width, frame.height); Graphics2D g = image.createGraphics(); try { // Might need to clear background diff --git a/imageio/imageio-pict/src/test/java/com/twelvemonkeys/imageio/plugins/pict/PICTImageReaderTest.java b/imageio/imageio-pict/src/test/java/com/twelvemonkeys/imageio/plugins/pict/PICTImageReaderTest.java index 4053aa38..13d26b2e 100644 --- a/imageio/imageio-pict/src/test/java/com/twelvemonkeys/imageio/plugins/pict/PICTImageReaderTest.java +++ b/imageio/imageio-pict/src/test/java/com/twelvemonkeys/imageio/plugins/pict/PICTImageReaderTest.java @@ -84,6 +84,7 @@ public class PICTImageReaderTest extends ImageReaderAbstractTest