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 2021/11/12 16:52:26 UTC
svn commit: r1894980 -
/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/PageDrawer.java
Author: tilman
Date: Fri Nov 12 16:52:25 2021
New Revision: 1894980
URL: http://svn.apache.org/viewvc?rev=1894980&view=rev
Log:
PDFBOX-4892: DRY refactor
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=1894980&r1=1894979&r2=1894980&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 Fri Nov 12 16:52:25 2021
@@ -1189,6 +1189,7 @@ public class PageDrawer extends PDFGraph
private void drawBufferedImage(BufferedImage image, AffineTransform at) throws IOException
{
+ AffineTransform originalTransform = graphics.getTransform();
AffineTransform imageTransform = new AffineTransform(at);
int width = image.getWidth();
int height = image.getHeight();
@@ -1202,8 +1203,6 @@ public class PageDrawer extends PDFGraph
Paint awtPaint = new TexturePaint(image, rectangle);
awtPaint = applySoftMaskToPaint(awtPaint, softMask);
graphics.setPaint(awtPaint);
-
- AffineTransform originalTransform = graphics.getTransform();
graphics.transform(imageTransform);
graphics.fill(rectangle);
graphics.setTransform(originalTransform);
@@ -1226,8 +1225,7 @@ public class PageDrawer extends PDFGraph
// will trigger the workaround. Because of the slowness we only do it if the user
// expects quality rendering and interpolation.
Matrix imageTransformMatrix = new Matrix(imageTransform);
- AffineTransform graphicsTransformA = graphics.getTransform();
- Matrix graphicsTransformMatrix = new Matrix(graphicsTransformA);
+ Matrix graphicsTransformMatrix = new Matrix(originalTransform);
float scaleX = Math.abs(imageTransformMatrix.getScalingFactorX() * graphicsTransformMatrix.getScalingFactorX());
float scaleY = Math.abs(imageTransformMatrix.getScalingFactorY() * graphicsTransformMatrix.getScalingFactorY());
@@ -1247,10 +1245,10 @@ public class PageDrawer extends PDFGraph
// hoping to reverse the rounding: without this, we get an horizontal line
// when rendering PDFJS-8860-Pattern-Size1.pdf at 100% )
imageTransform.scale(1f / w * image.getWidth(), 1f / h * image.getHeight());
- imageTransform.preConcatenate(graphicsTransformA);
+ imageTransform.preConcatenate(originalTransform);
graphics.setTransform(new AffineTransform());
graphics.drawImage(imageToDraw, imageTransform, null);
- graphics.setTransform(graphicsTransformA);
+ graphics.setTransform(originalTransform);
}
else
{