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

[ja...@apache.org]

Author: jahewson
Date: Tue Jul  1 17:05:38 2014
New Revision: 1607146

URL: http://svn.apache.org/r1607146
Log:
PDFBOX-2126: Store transformed clip rather than graphics state clip

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=1607146&r1=1607145&r2=1607146&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 Tue Jul  1 17:05:38 2014
@@ -107,7 +107,7 @@ public class PageDrawer extends PDFStrea
     private GeneralPath linePath = new GeneralPath();
 
     // last clipping path
-    private Area lastClip;
+    private Shape lastClip;
 
     private final Map<PDFont, Glyph2D> fontGlyph2D = new HashMap<PDFont, Glyph2D>();
     private final Map<PDFont, Font> awtFonts = new HashMap<PDFont, Font>();
@@ -259,11 +259,10 @@ public class PageDrawer extends PDFStrea
     // Graphics2D#getClip() returns a new object instead of the same one passed to setClip
     private void setClip()
     {
-        Area clippingPath = getGraphicsState().getCurrentClippingPath();
-        if (clippingPath != lastClip)
+        if (graphics.getClip() != lastClip)
         {
-            graphics.setClip(clippingPath);
-            lastClip = clippingPath;
+            graphics.setClip(getGraphicsState().getCurrentClippingPath());
+            lastClip = graphics.getClip();
         }
     }
 
@@ -847,7 +846,6 @@ public class PageDrawer extends PDFStrea
         graphics.setPaint(paint);
         graphics.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_OFF);
         graphics.setClip(null);
-        lastClip = null;
         graphics.fill(getGraphicsState().getCurrentClippingPath());
     }