Merge pull request #8 from DEXPRO-Solutions-GmbH/fix/landscape-scaling

Fix landscape scaling (due to hardcoded A4 page mediabox)

.gitignore

@@ -35,4 +35,5 @@ build/
 .vscode/
 
 ### Mac OS ###
-.DS_Store
+.DS_Store
+/tmp/

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>one.squeeze</groupId>
     <artifactId>pdftools</artifactId>
-    <version>0.1.1</version>
+    <version>0.1.2</version>
 
     <properties>
         <maven.compiler.source>8</maven.compiler.source>

src/main/java/one/squeeze/pdftools/DIN.java

@@ -0,0 +1,13 @@
+package one.squeeze.pdftools;
+
+import org.apache.pdfbox.pdmodel.common.PDRectangle;
+
+/**
+ * This class holds constants for DIN paper sizes.
+ */
+abstract public class DIN {
+
+    public static final PDRectangle A4 = PDRectangle.A4;
+    public static final PDRectangle A4_Landscape = new PDRectangle(A4.getHeight(), A4.getWidth());
+
+}

src/main/java/one/squeeze/pdftools/cli/cmds/FixPDFCommand.java

@@ -1,6 +1,7 @@
 package one.squeeze.pdftools.cli.cmds;
 
 
+import one.squeeze.pdftools.DIN;
 import one.squeeze.pdftools.app.scale.IScaler;
 import one.squeeze.pdftools.app.scale.NoopScaler;
 import one.squeeze.pdftools.app.scale.Scaler;
@@ -79,15 +80,23 @@ public static IScaler buildScaler(PDPage page) {
         float fWidth = 1;
         float fHeight = 1;
         if (isPortrait) {
-            fWidth = MAX_WIDTH / page.getMediaBox().getWidth();
-            fHeight = MAX_HEIGHT / page.getMediaBox().getHeight();
+            fWidth = MAX_WIDTH / mediaBox.getWidth();
+            fHeight = MAX_HEIGHT / mediaBox.getHeight();
         } else {
-            fWidth = MAX_HEIGHT / page.getMediaBox().getWidth();
-            fHeight = MAX_WIDTH / page.getMediaBox().getHeight();
+            fWidth = MAX_HEIGHT / mediaBox.getWidth();
+            fHeight = MAX_WIDTH / mediaBox.getHeight();
         }
 
         float factor = Math.min(fWidth, fHeight);
 
-        return new Scaler(factor, PDRectangle.A4);
+        // Determine new media box
+        PDRectangle targetMediaBox;
+        if (isPortrait) {
+            targetMediaBox = DIN.A4;
+        } else {
+            targetMediaBox = DIN.A4_Landscape;
+        }
+
+        return new Scaler(factor, targetMediaBox);
     }
 }

src/test/java/one/squeeze/pdftools/cli/cmds/FixPDFCommandTest.java

@@ -1,13 +1,15 @@
 package one.squeeze.pdftools.cli.cmds;
 
+import one.squeeze.pdftools.DIN;
 import one.squeeze.pdftools.app.scale.IScaler;
 import one.squeeze.pdftools.app.scale.NoopScaler;
 import one.squeeze.pdftools.app.scale.Scaler;
 import org.apache.pdfbox.pdmodel.PDPage;
 import org.apache.pdfbox.pdmodel.common.PDRectangle;
 import org.junit.jupiter.api.Test;
 
-import static org.junit.jupiter.api.Assertions.*;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 class FixPDFCommandTest {
 
@@ -77,7 +79,7 @@ void testBuildScaler_ScalesLargePortrait() {
 
         Scaler scaler = (Scaler) FixPDFCommand.buildScaler(page);
         assertEquals(TEN_PERCENT, scaler.getFactor());
-        assertEquals(PDRectangle.A4, scaler.getTargetMediaBox());
+        assertEquals(DIN.A4, scaler.getTargetMediaBox());
     }
 
     @Test
@@ -90,6 +92,6 @@ void testBuildScaler_ScalesLargeLandscape() {
 
         Scaler scaler = (Scaler) FixPDFCommand.buildScaler(page);
         assertEquals(TEN_PERCENT, scaler.getFactor());
-        assertEquals(PDRectangle.A4, scaler.getTargetMediaBox());
+        assertEquals(DIN.A4_Landscape, scaler.getTargetMediaBox());
     }
 }