Mercurial > hg > openjdk > jdk7 > jdk
changeset 1288:fb03586d68b6
6829659: Circle is rendered in C shape
Reviewed-by: campbell, flar
Contributed-by: Google <yamauchi@google.com>
author | jgodinez |
---|---|
date | Thu, 21 May 2009 09:56:03 -0700 |
parents | ec0a8acd4737 |
children | 907324eb3e64 |
files | src/share/classes/sun/java2d/pisces/PiscesCache.java test/sun/pisces/ScaleTest.java |
diffstat | 2 files changed, 59 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/classes/sun/java2d/pisces/PiscesCache.java Thu May 14 09:53:35 2009 -0700 +++ b/src/share/classes/sun/java2d/pisces/PiscesCache.java Thu May 21 09:56:03 2009 -0700 @@ -96,7 +96,7 @@ bboxX1 = x1+1; } else { if (bboxX0 > x0) bboxX0 = x0; - if (bboxX1 < x1) bboxX1 = x1; + if (bboxX1 < x1 + 1) bboxX1 = x1 + 1; while (bboxY1++ < y) { reallocRowInfo(alphaRows+1); minTouched[alphaRows] = 0;
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/sun/pisces/ScaleTest.java Thu May 21 09:56:03 2009 -0700 @@ -0,0 +1,58 @@ +/* + * Copyright 2009 Sun Microsystems, Inc. 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, + * CA 95054 USA or visit www.sun.com if you need additional information or + * have any questions. + */ + +import java.awt.*; +import java.awt.geom.Ellipse2D; +import java.awt.image.BufferedImage; +import java.io.File; +import javax.imageio.ImageIO; + + +public class ScaleTest { + public static void main(String[] args) throws Exception { + BufferedImage image = new BufferedImage(200, 200, BufferedImage.TYPE_INT_RGB); + Graphics2D g = image.createGraphics(); + + g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON); + g.setPaint(Color.WHITE); + g.fill(new Rectangle(image.getWidth(), image.getHeight())); + g.scale(.9, .9); + g.setPaint(Color.BLACK); + g.setStroke(new BasicStroke(0.5f)); + g.draw(new Ellipse2D.Double(25, 25, 150, 150)); + + // To visually check it + //ImageIO.write(image, "PNG", new File(args[0])); + + boolean nonWhitePixelFound = false; + for (int x = 100; x < 200; ++x) { + if (image.getRGB(x, 90) != Color.WHITE.getRGB()) { + nonWhitePixelFound = true; + break; + } + } + if (!nonWhitePixelFound) { + throw new RuntimeException("A circle is rendered like a 'C' shape."); + } + } +}