[kaffe] CVS kaffe (robilad): Resynced with GNU Classpath: cleanups in Area

[Kaffe CVS]

PatchSet 5532 
Date: 2004/12/04 01:42:54
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
Resynced with GNU Classpath: cleanups in Area

2004-12-03  Dalibor Topic  <robilad at kaffe.org>

        *  libraries/javalib/java/awt/geom/Area.java:
        Resynced with GNU Classpath.

        2004-12-01  Michael Koch  <konqueror at gmx.de>

        * java/awt/geom/Area.java
        (QuadSegment.curveArea): Remove unused variables.
        (CubicSegment.curveArea): Likewise.

Members: 
	ChangeLog:1.3078->1.3079 
	libraries/javalib/java/awt/geom/Area.java:1.4->1.5 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3078 kaffe/ChangeLog:1.3079
--- kaffe/ChangeLog:1.3078	Sat Dec  4 01:33:41 2004
+++ kaffe/ChangeLog	Sat Dec  4 01:42:54 2004
@@ -1,5 +1,16 @@
 2004-12-03  Dalibor Topic  <robilad at kaffe.org>
 
+	*  libraries/javalib/java/awt/geom/Area.java:
+	Resynced with GNU Classpath.
+
+	2004-12-01  Michael Koch  <konqueror at gmx.de>
+
+        * java/awt/geom/Area.java
+        (QuadSegment.curveArea): Remove unused variables.
+        (CubicSegment.curveArea): Likewise.
+
+2004-12-03  Dalibor Topic  <robilad at kaffe.org>
+
 	* libraries/javalib/gnu/java/locale/LocaleInformation_af_ZA.java,
 	libraries/javalib/gnu/java/locale/LocaleInformation_ar_DZ.java,
 	libraries/javalib/gnu/java/locale/LocaleInformation_ar_IN.java,
Index: kaffe/libraries/javalib/java/awt/geom/Area.java
diff -u kaffe/libraries/javalib/java/awt/geom/Area.java:1.4 kaffe/libraries/javalib/java/awt/geom/Area.java:1.5
--- kaffe/libraries/javalib/java/awt/geom/Area.java:1.4	Thu Nov 25 00:09:15 2004
+++ kaffe/libraries/javalib/java/awt/geom/Area.java	Sat Dec  4 01:42:58 2004
@@ -2631,11 +2631,9 @@
 
       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 @@
       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;