changeset 1234:53ca5822bdfe

6829678: StrokeShapeTest: createStrokedShape() behaves differently Reviewed-by: igor, flar Contributed-by: rkennke <roman.kennke@aicas.com>
author jgodinez
date Tue, 21 Apr 2009 09:43:49 -0700
parents c3aaa11e4eb6
children b4450e6de8a3
files src/share/classes/sun/java2d/pisces/Stroker.java test/sun/pisces/StrokeShapeTest.java
diffstat 2 files changed, 74 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/classes/sun/java2d/pisces/Stroker.java	Mon Apr 20 12:31:36 2009 -0700
+++ b/src/share/classes/sun/java2d/pisces/Stroker.java	Tue Apr 21 09:43:49 2009 -0700
@@ -181,7 +181,7 @@
                               Transform4 transform) {
         this.lineWidth = lineWidth;
         this.lineWidth2 = lineWidth >> 1;
-        this.scaledLineWidth2 = (long)transform.m00*lineWidth2;
+        this.scaledLineWidth2 = ((long)transform.m00*lineWidth2) >> 16;
         this.capStyle = capStyle;
         this.joinStyle = joinStyle;
         this.miterLimit = miterLimit;
@@ -243,8 +243,8 @@
             if (ilen == 0) {
                 dx = dy = 0;
             } else {
-                dx = (int)( (ly*scaledLineWidth2)/ilen >> 16);
-                dy = (int)(-(lx*scaledLineWidth2)/ilen >> 16);
+                dx = (int)( (ly*scaledLineWidth2)/ilen);
+                dy = (int)(-(lx*scaledLineWidth2)/ilen);
             }
         } else {
             double dlx = x1 - x0;
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/sun/pisces/StrokeShapeTest.java	Tue Apr 21 09:43:49 2009 -0700
@@ -0,0 +1,71 @@
+/*
+ * 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.geom.GeneralPath;
+import java.awt.image.BufferedImage;
+import java.io.File;
+
+import javax.imageio.ImageIO;
+
+/**
+ * @author chrisn@google.com (Chris Nokleberg)
+ * @author yamauchi@google.com (Hiroshi Yamauchi)
+ */
+public class StrokeShapeTest {
+  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.translate(25, 100);
+
+    Stroke stroke = new BasicStroke(200, BasicStroke.CAP_ROUND, BasicStroke.JOIN_ROUND);
+    Shape shape = new Polygon(new int[] {0, 1500, 0}, new int[] {750, 0, -750}, 3);
+
+    g.scale(.1, .1);
+    g.setPaint(Color.BLACK);
+    g.setStroke(stroke);
+    g.draw(shape);
+    g.setPaint(Color.RED);
+    g.fill(stroke.createStrokedShape(shape));
+
+    // To visually check it
+    //ImageIO.write(image, "PNG", new File(args[0]));
+
+    boolean blackPixelFound = false;
+    outer:
+    for (int x = 0; x < 200; ++x) {
+      for (int y = 0; y < 200; ++y) {
+        if (image.getRGB(x, y) == Color.BLACK.getRGB()) {
+          blackPixelFound = true;
+          break outer;
+        }
+      }
+    }
+    if (blackPixelFound) {
+      throw new RuntimeException("The shape hasn't been filled in red.");
+    }
+  }
+}