From 8c59a964704650263828695615032a46ae073755 Mon Sep 17 00:00:00 2001 From: Krystian Dabrowski Date: Mon, 27 Mar 2023 16:39:35 +0200 Subject: [PATCH] ATS-996: TIFF to PDF - invalid output format --- .../java/org/alfresco/transform/aio/AIOTikaTest.java | 1 + .../misc/transformers/ImageToPdfTransformer.java | 12 +++++++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/engines/aio/src/test/java/org/alfresco/transform/aio/AIOTikaTest.java b/engines/aio/src/test/java/org/alfresco/transform/aio/AIOTikaTest.java index e4582a45..a1007538 100644 --- a/engines/aio/src/test/java/org/alfresco/transform/aio/AIOTikaTest.java +++ b/engines/aio/src/test/java/org/alfresco/transform/aio/AIOTikaTest.java @@ -64,6 +64,7 @@ public class AIOTikaTest extends TikaTest "page", "pageLimit", "pdfFormat", + "pdfOrientation", "resizeHeight", "resizePercentage", "resizeWidth", diff --git a/engines/misc/src/main/java/org/alfresco/transform/misc/transformers/ImageToPdfTransformer.java b/engines/misc/src/main/java/org/alfresco/transform/misc/transformers/ImageToPdfTransformer.java index faff055f..d6167cfb 100644 --- a/engines/misc/src/main/java/org/alfresco/transform/misc/transformers/ImageToPdfTransformer.java +++ b/engines/misc/src/main/java/org/alfresco/transform/misc/transformers/ImageToPdfTransformer.java @@ -150,12 +150,13 @@ public class ImageToPdfTransformer implements CustomTransformerFileAdaptor } } - private PDRectangle resolvePdfFormat(final String pdfFormat, final String pdfOrientation, final int actualWidth, final int actualHeight) + private PDRectangle resolvePdfFormat(final String pdfFormat, final String pdfOrientation, final int defaultWidth, final int defaultHeight) { PDRectangle pdRectangle; - switch (pdfFormat.toUpperCase()) { + switch (pdfFormat.toUpperCase()) + { case "DEFAULT": - pdRectangle = new PDRectangle(actualWidth, actualHeight); + pdRectangle = new PDRectangle(defaultWidth, defaultHeight); break; case "A4": pdRectangle = PDRectangle.A4; @@ -186,11 +187,12 @@ public class ImageToPdfTransformer implements CustomTransformerFileAdaptor break; default: log.warn("PDF format: '{}' not supported. Maintaining the default one.", pdfFormat); - pdRectangle = new PDRectangle(actualWidth, actualHeight); + pdRectangle = new PDRectangle(defaultWidth, defaultHeight); break; } - switch (pdfOrientation.toUpperCase()) { + switch (pdfOrientation.toUpperCase()) + { case "DEFAULT": break; case "PORTRAIT":