[commit-cp] classpath ChangeLog java/awt/geom/GeneralPath.java

[Mark Wielaard]

CVSROOT:        /cvsroot/classpath
Module name:    classpath
Changes by:     Mark Wielaard <mark>    06/06/15 18:18:51

Modified files:
        .              : ChangeLog 
        java/awt/geom  : GeneralPath.java 

Log message:
               * java/awt/geom/GeneralPath.java (closePath): Return if path 
already
               closed.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7829&r2=1.7830
http://cvs.savannah.gnu.org/viewcvs/classpath/java/awt/geom/GeneralPath.java?cvsroot=classpath&r1=1.15&r2=1.16

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7829
retrieving revision 1.7830
diff -u -b -r1.7829 -r1.7830
--- ChangeLog   15 Jun 2006 18:15:10 -0000      1.7829
+++ ChangeLog   15 Jun 2006 18:18:51 -0000      1.7830
@@ -1,5 +1,10 @@
 2006-06-15  Mark Wielaard  <address@hidden>
 
+       * java/awt/geom/GeneralPath.java (closePath): Return if path already
+       closed.
+
+2006-06-15  Mark Wielaard  <address@hidden>
+
        * java/awt/BasicStroke.java (createStrokedShape): Call getPathIterator
        with null argument.
 

Index: java/awt/geom/GeneralPath.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/awt/geom/GeneralPath.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- java/awt/geom/GeneralPath.java      11 May 2006 08:27:27 -0000      1.15
+++ java/awt/geom/GeneralPath.java      15 Jun 2006 18:18:51 -0000      1.16
@@ -247,10 +247,12 @@
 
   /**
    * Closes the current subpath by drawing a line
-   * back to the point of the last moveTo.
+   * back to the point of the last moveTo, unless the path is already closed.
    */
   public void closePath()
   {
+    if (index >= 1 && types[index - 1] == PathIterator.SEG_CLOSE)
+      return;
     ensureSize(index + 1);
     types[index] = PathIterator.SEG_CLOSE;
     xpoints[index] = xpoints[subpath];