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/02/03 17:20:18 UTC
svn commit: r1886173 -
/pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/rendering/PageDrawer.java
Author: tilman
Date: Wed Feb 3 17:20:18 2021
New Revision: 1886173
URL: http://svn.apache.org/viewvc?rev=1886173&view=rev
Log:
PDFBOX-5091: also consider subsampling when getting actual image to know its size
Modified:
pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/rendering/PageDrawer.java
Modified: pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/rendering/PageDrawer.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/rendering/PageDrawer.java?rev=1886173&r1=1886172&r2=1886173&view=diff
==============================================================================
--- pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/rendering/PageDrawer.java (original)
+++ pdfbox/branches/2.0/pdfbox/src/main/java/org/apache/pdfbox/rendering/PageDrawer.java Wed Feb 3 17:20:18 2021
@@ -1056,8 +1056,18 @@ public class PageDrawer extends PDFGraph
// only when scaled up do we use nearest neighbour, eg PDFBOX-2302 / mori-cvpr01.pdf
// PDFBOX-4930: we use the sizes of the ARGB image. These can be different
// than the original sizes of the base image, when the mask is bigger.
- boolean isScaledUp = pdImage.getImage().getWidth() < Math.round(at.getScaleX()) ||
- pdImage.getImage().getHeight() < Math.round(at.getScaleY());
+ // PDFBOX-5091: also consider subsampling, the sizes are different too.
+ BufferedImage bim;
+ if (subsamplingAllowed)
+ {
+ bim = pdImage.getImage(null, getSubsampling(pdImage, at));
+ }
+ else
+ {
+ bim = pdImage.getImage();
+ }
+ boolean isScaledUp = bim.getWidth() < Math.round(at.getScaleX()) ||
+ bim.getHeight() < Math.round(at.getScaleY());
if (isScaledUp)
{