You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by ti...@apache.org on 2018/06/17 15:06:14 UTC

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

Author: tilman
Date: Sun Jun 17 15:06:13 2018
New Revision: 1833663

URL: http://svn.apache.org/viewvc?rev=1833663&view=rev
Log:
PDFBOX-4245: consider translation in xform, as suggested by Jiri Kunhart

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=1833663&r1=1833662&r2=1833663&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 Sun Jun 17 15:06:13 2018
@@ -1466,8 +1466,9 @@ public class PageDrawer extends PDFGraph
             AffineTransform dpiTransform = AffineTransform.getScaleInstance(Math.abs(m.getScalingFactorX()), Math.abs(m.getScalingFactorY()));
             size = dpiTransform.transform(size, size);
             // Flip y
-            return new Rectangle2D.Double(minX - pageSize.getLowerLeftX() * m.getScalingFactorX(),
-                    size.getY() - minY - height + pageSize.getLowerLeftY() * m.getScalingFactorY(),
+            // PDFBOX-4245 also consider translation in xform
+            return new Rectangle2D.Double(minX - pageSize.getLowerLeftX() * m.getScalingFactorX() + xform.getTranslateX(),
+                   size.getY() - minY - height + pageSize.getLowerLeftY() * m.getScalingFactorY() + xform.getTranslateY(),
                     width, height);
         }
     }