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 2016/08/03 16:05:49 UTC

svn commit: r1755094 - /pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/printing/PDFPrintable.java

Author: tilman
Date: Wed Aug  3 16:05:49 2016
New Revision: 1755094

URL: http://svn.apache.org/viewvc?rev=1755094&view=rev
Log:
PDFBOX-3306: only stretch to fit when enabled

Modified:
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/printing/PDFPrintable.java

Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/printing/PDFPrintable.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/printing/PDFPrintable.java?rev=1755094&r1=1755093&r2=1755094&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/printing/PDFPrintable.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/printing/PDFPrintable.java Wed Aug  3 16:05:49 2016
@@ -148,6 +148,12 @@ public final class PDFPrintable implemen
                 {
                     scale = 1;
                 }
+                
+                // only stretch to fit when enabled
+                if (scale < 1 && scaling == Scaling.STRETCH_TO_FIT)
+                {
+                    scale = 1;
+                }
             }
 
             // set the graphics origin to the origin of the imageable area (i.e the margins)
@@ -166,8 +172,8 @@ public final class PDFPrintable implemen
             if (dpi > 0)
             {
                 float dpiScale = dpi / 72;
-                image = new BufferedImage((int)(imageableWidth * dpiScale),
-                                          (int)(imageableHeight * dpiScale),
+                image = new BufferedImage((int)(imageableWidth * dpiScale / scale),
+                                          (int)(imageableHeight * dpiScale / scale),
                                           BufferedImage.TYPE_INT_ARGB);
 
                 printerGraphics = graphics2D;