diff options
Diffstat (limited to 'libjava/java/awt')
| -rw-r--r-- | libjava/java/awt/font/FontRenderContext.java | 15 | ||||
| -rw-r--r-- | libjava/java/awt/geom/Rectangle2D.java | 8 |
2 files changed, 20 insertions, 3 deletions
diff --git a/libjava/java/awt/font/FontRenderContext.java b/libjava/java/awt/font/FontRenderContext.java index b8202a8..2bec38d 100644 --- a/libjava/java/awt/font/FontRenderContext.java +++ b/libjava/java/awt/font/FontRenderContext.java @@ -1,5 +1,5 @@ /* FontRenderContext.java - Copyright (C) 2002 Free Software Foundation, Inc. + Copyright (C) 2002, 2003 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -88,11 +88,22 @@ public class FontRenderContext && usesFractionalMetrics == rhs.usesFractionalMetrics ()); } + + /** + * Retrieves the affine transform for scaling typographical points + * to raster pixels. + * + * @return a clone of the transform object. + */ public AffineTransform getTransform () { - return affineTransform; + if (affineTransform == null) + return new AffineTransform (); + else + return new AffineTransform (affineTransform); } + /** * Returns the hash code of the font render context. */ diff --git a/libjava/java/awt/geom/Rectangle2D.java b/libjava/java/awt/geom/Rectangle2D.java index e63e1ba..8203ca3 100644 --- a/libjava/java/awt/geom/Rectangle2D.java +++ b/libjava/java/awt/geom/Rectangle2D.java @@ -399,7 +399,13 @@ public abstract class Rectangle2D extends RectangularShape public int getWindingRule() { - return WIND_EVEN_ODD; + // A test program showed that Sun J2SE 1.3.1 and 1.4.1_01 + // return WIND_NON_ZERO paths. While this does not really + // make any difference for rectangles (because they are not + // self-intersecting), it seems appropriate to behave + // identically. + + return WIND_NON_ZERO; } public boolean isDone() |