diff options
Diffstat (limited to 'libjava/java/awt/geom')
| -rw-r--r-- | libjava/java/awt/geom/Area.java | 4 | ||||
| -rw-r--r-- | libjava/java/awt/geom/Rectangle2D.java | 14 |
2 files changed, 7 insertions, 11 deletions
diff --git a/libjava/java/awt/geom/Area.java b/libjava/java/awt/geom/Area.java index 9b1b9d3..68f905f 100644 --- a/libjava/java/awt/geom/Area.java +++ b/libjava/java/awt/geom/Area.java @@ -2631,11 +2631,9 @@ public class Area implements Shape, Cloneable double P = (y2 - 2 * y1 + y0); double Q = 2 * (y1 - y0); - double R = y0; double A = (x2 - 2 * x1 + x0); double B = 2 * (x1 - x0); - double C = x0; double area = (B * P - A * Q) / 3.0; return (area); @@ -2937,12 +2935,10 @@ public class Area implements Shape, Cloneable double P = y3 - 3 * y2 + 3 * y1 - y0; double Q = 3 * (y2 + y0 - 2 * y1); double R = 3 * (y1 - y0); - double S = y0; double A = x3 - 3 * x2 + 3 * x1 - x0; double B = 3 * (x2 + x0 - 2 * x1); double C = 3 * (x1 - x0); - double D = x0; double area = (B * P - A * Q) / 5.0 + (C * P - A * R) / 2.0 + (C * Q - B * R) / 3.0; diff --git a/libjava/java/awt/geom/Rectangle2D.java b/libjava/java/awt/geom/Rectangle2D.java index bd1a37c..d8217fe 100644 --- a/libjava/java/awt/geom/Rectangle2D.java +++ b/libjava/java/awt/geom/Rectangle2D.java @@ -1,5 +1,5 @@ /* Rectangle2D.java -- generic rectangles in 2-D space - Copyright (C) 2000, 2001, 2002 Free Software Foundation + Copyright (C) 2000, 2001, 2002, 2004 Free Software Foundation This file is part of GNU Classpath. @@ -57,30 +57,30 @@ import java.util.NoSuchElementException; public abstract class Rectangle2D extends RectangularShape { /** - * The point lies left of the rectangle (p.x < r.x). + * The point lies left of the rectangle (p.x < r.x). * - * @see #outcode() + * @see #outcode(double, double) */ public static final int OUT_LEFT = 1; /** - * The point lies above the rectangle (p.y < r.y). + * The point lies above the rectangle (p.y < r.y). * - * @see #outcode() + * @see #outcode(double, double) */ public static final int OUT_TOP = 2; /** * The point lies right of the rectangle (p.x > r.maxX). * - * @see #outcode() + * @see #outcode(double, double) */ public static final int OUT_RIGHT = 4; /** * The point lies below of the rectangle (p.y > r.maxY). * - * @see #outcode() + * @see #outcode(double, double) */ public static final int OUT_BOTTOM = 8; |