You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by je...@apache.org on 2005/08/12 10:24:01 UTC

svn commit: r232234 - /xmlgraphics/fop/trunk/src/java/org/apache/fop/render/java2d/Java2DRenderer.java

Author: jeremias
Date: Fri Aug 12 01:23:57 2005
New Revision: 232234

URL: http://svn.apache.org/viewcvs?rev=232234&view=rev
Log:
Bugzilla #36146
Image scaling didn't work in the Java2D based renderers, as the putImage
function was referring to the wrong height/width.
Submitted by: Richard Wheeldon <richardw.at.geoquip-rnd.demon.co.uk>

Modified:
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/java2d/Java2DRenderer.java

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/java2d/Java2DRenderer.java
URL: http://svn.apache.org/viewcvs/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/java2d/Java2DRenderer.java?rev=232234&r1=232233&r2=232234&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/java2d/Java2DRenderer.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/java2d/Java2DRenderer.java Fri Aug 12 01:23:57 2005
@@ -986,8 +986,9 @@
             // url = "C:/eclipse/myWorkbenches/fop4/xml-fop/examples/fo" + url;
             java.awt.Image awtImage = new javax.swing.ImageIcon(url).getImage();
 
-            state.getGraph().drawImage(awtImage, (int) (x / 1000f),
-                    (int) (y / 1000f), (int) w, h, null);
+            state.getGraph().drawImage(awtImage, 
+                    (int)(x / 1000f), (int)(y / 1000f), 
+                    (int)(pos.getWidth() / 1000f), (int)(pos.getHeight() / 1000f), null);
             currentBPPosition += (h * 1000);
         } else {
             if (!fopimage.load(FopImage.BITMAP)) {
@@ -1014,8 +1015,9 @@
             // Combine the color model and raster into a buffered image
             awtImage = new BufferedImage(cm, raster, false, null);
 
-            state.getGraph().drawImage(awtImage, (int) (x / 1000f),
-                    (int) (y / 1000f), (int) w, h, null);
+            state.getGraph().drawImage(awtImage, 
+                    (int)(x / 1000f), (int)(y / 1000f), 
+                    (int)(pos.getWidth() / 1000f), (int)(pos.getHeight() / 1000f), null);
             currentBPPosition += (h * 1000);
         }
     }



---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org