# HG changeset patch # User serb # Date 1372863610 -14400 # Node ID 482096e5f6144770dc7433ab134cb41f39b56003 # Parent 93645a7dac667ef540782f2f483721e728656092 8004859: Graphics.getClipBounds/getClip return difference nonequivalent bounds, depending from transform Reviewed-by: prr, flar diff -r 93645a7dac66 -r 482096e5f614 jdk/src/share/classes/sun/java2d/SunGraphics2D.java --- a/jdk/src/share/classes/sun/java2d/SunGraphics2D.java Tue Jul 02 14:25:56 2013 -0700 +++ b/jdk/src/share/classes/sun/java2d/SunGraphics2D.java Wed Jul 03 19:00:10 2013 +0400 @@ -1795,20 +1795,10 @@ } public Rectangle getClipBounds() { - Rectangle r; if (clipState == CLIP_DEVICE) { - r = null; - } else if (transformState <= TRANSFORM_INT_TRANSLATE) { - if (usrClip instanceof Rectangle) { - r = new Rectangle((Rectangle) usrClip); - } else { - r = usrClip.getBounds(); - } - r.translate(-transX, -transY); - } else { - r = getClip().getBounds(); + return null; } - return r; + return getClipBounds(new Rectangle()); } public Rectangle getClipBounds(Rectangle r) { @@ -1817,11 +1807,11 @@ if (usrClip instanceof Rectangle) { r.setBounds((Rectangle) usrClip); } else { - r.setBounds(usrClip.getBounds()); + r.setFrame(usrClip.getBounds2D()); } r.translate(-transX, -transY); } else { - r.setBounds(getClip().getBounds()); + r.setFrame(getClip().getBounds2D()); } } else if (r == null) { throw new NullPointerException("null rectangle parameter"); @@ -1996,10 +1986,10 @@ matrix[2] = matrix[0] + rect.getWidth(); matrix[3] = matrix[1] + rect.getHeight(); tx.transform(matrix, 0, matrix, 0, 2); - rect = new Rectangle2D.Float(); - rect.setFrameFromDiagonal(matrix[0], matrix[1], - matrix[2], matrix[3]); - return rect; + fixRectangleOrientation(matrix, rect); + return new Rectangle2D.Double(matrix[0], matrix[1], + matrix[2] - matrix[0], + matrix[3] - matrix[1]); } if (tx.isIdentity()) { @@ -2009,6 +1999,22 @@ return tx.createTransformedShape(clip); } + /** + * Sets orientation of the rectangle according to the clip. + */ + private static void fixRectangleOrientation(double[] m, Rectangle2D clip) { + if (clip.getWidth() > 0 != (m[2] - m[0] > 0)) { + double t = m[0]; + m[0] = m[2]; + m[2] = t; + } + if (clip.getHeight() > 0 != (m[3] - m[1] > 0)) { + double t = m[1]; + m[1] = m[3]; + m[3] = t; + } + } + public void clipRect(int x, int y, int w, int h) { clip(new Rectangle(x, y, w, h)); } diff -r 93645a7dac66 -r 482096e5f614 jdk/test/java/awt/Graphics2D/Test8004859/Test8004859.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jdk/test/java/awt/Graphics2D/Test8004859/Test8004859.java Wed Jul 03 19:00:10 2013 +0400 @@ -0,0 +1,102 @@ +/* + * Copyright (c) 2013, 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.Graphics2D; +import java.awt.Rectangle; +import java.awt.Shape; +import java.awt.geom.NoninvertibleTransformException; +import java.awt.image.BufferedImage; + +import sun.java2d.SunGraphics2D; + +/** + * @test + * @bug 8004859 + * @summary getClipBounds/getClip should return equivalent bounds. + * @author Sergey Bylokhov + */ +public final class Test8004859 { + + private static Shape[] clips = {new Rectangle(0, 0, 1, 1), new Rectangle( + 100, 100, -100, -100)}; + + private static boolean status = true; + + public static void main(final String[] args) + throws NoninvertibleTransformException { + final BufferedImage bi = new BufferedImage(300, 300, + BufferedImage.TYPE_INT_RGB); + final Graphics2D g = (Graphics2D) bi.getGraphics(); + test(g); + g.translate(2.0, 2.0); + test(g); + g.translate(-4.0, -4.0); + test(g); + g.scale(2.0, 2.0); + test(g); + g.scale(-4.0, -4.0); + test(g); + g.rotate(Math.toRadians(90)); + test(g); + g.rotate(Math.toRadians(90)); + test(g); + g.rotate(Math.toRadians(90)); + test(g); + g.rotate(Math.toRadians(90)); + test(g); + g.dispose(); + if (!status) { + throw new RuntimeException("Test failed"); + } + } + + private static void test(final Graphics2D g) { + for (final Shape clip : clips) { + g.setClip(clip); + if (!g.getClip().equals(clip)) { + System.err.println("Expected clip: " + clip); + System.err.println("Actual clip: " + g.getClip()); + System.err.println("bounds="+g.getClip().getBounds2D()); + System.err.println("bounds="+g.getClip().getBounds()); + status = false; + } + final Rectangle bounds = g.getClipBounds(); + if (!clip.equals(bounds)) { + System.err.println("Expected getClipBounds(): " + clip); + System.err.println("Actual getClipBounds(): " + bounds); + status = false; + } + g.getClipBounds(bounds); + if (!clip.equals(bounds)) { + System.err.println("Expected getClipBounds(r): " + clip); + System.err.println("Actual getClipBounds(r): " + bounds); + status = false; + } + if (!clip.getBounds2D().isEmpty() && ((SunGraphics2D) g).clipRegion + .isEmpty()) { + System.err.println("clipRegion should not be empty"); + status = false; + } + } + } +}