1 files changed, 5 insertions, 10 deletions
diff --git a/src/java/org/apache/fop/render/AbstractPathOrientedRenderer.java b/src/java/org/apache/fop/render/AbstractPathOrientedRenderer.java
index 3d0089a73..93645821e 100644
--- a/src/java/org/apache/fop/render/AbstractPathOrientedRenderer.java
+++ b/src/java/org/apache/fop/render/AbstractPathOrientedRenderer.java
@@ -509,28 +509,23 @@ public abstract class AbstractPathOrientedRenderer extends PrintRenderer {
             x += borderPaddingStart / 1000f;
             y += borderPaddingBefore / 1000f;
 
+            if (ctm != null) {
+                startVParea(ctm);
+                currentIPPosition = 0;
+                currentBPPosition = 0;
+            }
             // clip if necessary
             if (bv.getClip()) {
-                saveGraphicsState();
                 float width = (float)bv.getIPD() / 1000f;
                 float height = (float)bv.getBPD() / 1000f;
                 clipRect(x, y, width, height);
             }
 
-            if (ctm != null) {
-                startVParea(ctm);
-                currentIPPosition = 0;
-                currentBPPosition = 0;
-            }
             renderBlocks(bv, children);
             if (ctm != null) {
                 endVParea();
             }
 
-            if (bv.getClip()) {
-                restoreGraphicsState();
-            }
-
             currentIPPosition = saveIP;
             currentBPPosition = saveBP;