svn commit: r931633 - in /pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox: pdfviewer/PageDrawer.java util/operator/pagedrawer/Invoke.java

[da...@apache.org]

Author: danielwilson
Date: Wed Apr  7 18:19:54 2010
New Revision: 931633

URL: http://svn.apache.org/viewvc?rev=931633&view=rev
Log:
Refactor out another getGraphics call for extensibilty.

Modified:
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfviewer/PageDrawer.java
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/operator/pagedrawer/Invoke.java

Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfviewer/PageDrawer.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfviewer/PageDrawer.java?rev=931633&r1=931632&r2=931633&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfviewer/PageDrawer.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfviewer/PageDrawer.java Wed Apr  7 18:19:54 2010
@@ -29,6 +29,7 @@ import java.awt.RenderingHints;
 import java.awt.geom.AffineTransform;
 import java.awt.geom.GeneralPath;
 import java.awt.geom.Point2D;
+import java.awt.Image;
 import java.io.IOException;
 import java.util.List;
 import java.util.Map;
@@ -371,6 +372,19 @@ public class PageDrawer extends PDFStrea
     }
     
     /**
+     * Draw the AWT image. Called by Invoke.
+     * Moved into PageDrawer so that Invoke doesn't have to reach in here for Graphics as that breaks extensibility.
+     *
+     * @param awtImage The image to draw.
+     * @param at The transformation to use when drawing.
+     * 
+     */
+    public void drawImage(Image awtImage, AffineTransform at){        
+                graphics.setClip(getGraphicsState().getCurrentClippingPath());
+                graphics.drawImage( awtImage, at, null );
+    }
+    
+    /**
      * Fill with Shading.  Called by SHFill operator.
      *
      * @param ShadingName  The name of the Shading Dictionary to use for this fill instruction.

Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/operator/pagedrawer/Invoke.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/operator/pagedrawer/Invoke.java?rev=931633&r1=931632&r2=931633&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/operator/pagedrawer/Invoke.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/operator/pagedrawer/Invoke.java Wed Apr  7 18:19:54 2010
@@ -108,8 +108,8 @@ public class Invoke extends OperatorProc
                         rotationMatrix.getValue(1,0), rotationMatrix.getValue( 1, 1),
                         rotationMatrix.getValue(2,0),rotationMatrix.getValue(2,1)
                     );
-                graphics.setClip(context.getGraphicsState().getCurrentClippingPath());
-                graphics.drawImage( awtImage, at, null );
+               
+                drawer.drawImage( awtImage, at );
             }
             catch( Exception e )
             {