svn commit: r1580212 - /pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/PageDrawer.java

[ti...@apache.org]

Author: tilman
Date: Sat Mar 22 14:14:00 2014
New Revision: 1580212

URL: http://svn.apache.org/r1580212
Log:
PDFBOX-1954: "fill, and then stroke the path" operators must "fill and stroke", not "stroke and fill"

Modified:
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/PageDrawer.java

Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/PageDrawer.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/PageDrawer.java?rev=1580212&r1=1580211&r2=1580212&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/PageDrawer.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/PageDrawer.java Sat Mar 22 14:14:00 2014
@@ -708,7 +708,7 @@ public class PageDrawer extends PDFStrea
     }
 
     /**
-     * Strokes and fills the path.
+     * Fills and then strokes the path.
      *
      * @param windingRule The winding rule this path will use.
      *
@@ -716,11 +716,12 @@ public class PageDrawer extends PDFStrea
      */
     public void strokeAndFillPath(int windingRule) throws IOException
     {
+        //TODO rename this method
         // TODO can we avoid cloning the path?
         GeneralPath path = (GeneralPath)linePath.clone();
-        strokePath();
-        linePath = path;
         fillPath(windingRule);
+        linePath = path;
+        strokePath();
     }
 
     // This code generalizes the code Jim Lynch wrote for AppendRectangleToPath