# HG changeset patch # User psadhukhan # Date 1444652883 -10800 # Node ID 2ce30cca1503f561105a9e0a6341129db33747f8 # Parent 78e7353193560e9ed91aa12882ffbf3e5380bf68 8072682: getBounds call on graphics.getDeviceConfiguration() returning cached information Reviewed-by: serb, flar diff -r 78e735319356 -r 2ce30cca1503 jdk/src/java.desktop/share/classes/sun/awt/image/BufferedImageGraphicsConfig.java --- a/jdk/src/java.desktop/share/classes/sun/awt/image/BufferedImageGraphicsConfig.java Wed Oct 07 19:47:35 2015 +0300 +++ b/jdk/src/java.desktop/share/classes/sun/awt/image/BufferedImageGraphicsConfig.java Mon Oct 12 15:28:03 2015 +0300 @@ -67,7 +67,6 @@ GraphicsDevice gd; ColorModel model; Raster raster; - int width, height; public BufferedImageGraphicsConfig(BufferedImage bufImg, Component comp) { if (comp == null) { @@ -78,8 +77,6 @@ } this.model = bufImg.getColorModel(); this.raster = bufImg.getRaster().createCompatibleWritableRaster(1, 1); - this.width = bufImg.getWidth(); - this.height = bufImg.getHeight(); } /** @@ -168,6 +165,6 @@ } public Rectangle getBounds() { - return new Rectangle(0, 0, width, height); + return new Rectangle(0, 0, Integer.MAX_VALUE, Integer.MAX_VALUE); } } diff -r 78e735319356 -r 2ce30cca1503 jdk/test/java/awt/Graphics2D/DeviceBounds.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jdk/test/java/awt/Graphics2D/DeviceBounds.java Mon Oct 12 15:28:03 2015 +0300 @@ -0,0 +1,54 @@ +/* + * Copyright (c) 2015, 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. + */ +import java.awt.*; +import java.awt.image.BufferedImage; + +/** + * @test + * @bug 8072682 + * @summary Graphics.getDeviceConfiguration().getBounds returns wrong width/height + * @run main DeviceBounds + */ +public class DeviceBounds { + public static void main(String[] args) { + // NB: all images have the same type + BufferedImage[] images = new BufferedImage[] { + new BufferedImage(200, 200, BufferedImage.TYPE_3BYTE_BGR), + new BufferedImage(400, 400, BufferedImage.TYPE_3BYTE_BGR), + new BufferedImage(100, 100, BufferedImage.TYPE_3BYTE_BGR) + }; + int count = 0; + for (BufferedImage i : images) { + Graphics2D g = i.createGraphics(); + Rectangle bounds[] = new Rectangle[images.length]; + bounds[count] = g.getDeviceConfiguration().getBounds(); + System.out.println(bounds[count]); + + g.dispose(); + if (bounds[count].width != Integer.MAX_VALUE) { + throw new RuntimeException("Wrong getBounds"); + } + count++; + } + } +}