inteligr8/alfresco-transform-core
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-transform-core.git synced 2026-04-23 22:30:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

ACS-10698 Fix for ImageToPdfTransformer when image pixel size is very less (#1160)

Browse Source 
* ACS-10698 Fix for ImageToPdfTransformer when image pixel size is very less

* Added test

* Added test

* precommit fix
This commit is contained in:
Satyam Sah
2025-11-19 10:47:37 +05:30
committed by GitHub
parent 380ef081f5
commit daf3123fab
3 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
engines/misc/src/main/java/org/alfresco/transform/misc/transformers/ImageToPdfTransformer.java
View File

@@ -82,6 +82,8 @@ public class ImageToPdfTransformer implements CustomTransformerFileAdaptor
private static final String DEFAULT_PDF_FORMAT_STRING = "DEFAULT"; // pdf format to use when no pdf format specified
private static final String DEFAULT_PDF_ORIENTATION_STRING = "DEFAULT";
private static final float PDFBOX_POINTS_PER_INCH = 72.0F;
private static final int MIN_REASONABLE_DPI = 30;
private static final int MAX_REASONABLE_DPI = 600;
private static final List<String> DENY_LIST = List.of("com.github.jaiimageio.impl.plugins.tiff.TIFFImageReader");
@Override
@@ -145,6 +147,16 @@ public class ImageToPdfTransformer implements CustomTransformerFileAdaptor
throw new IOException(String.format(INVALID_IMAGE_ERROR_MESSAGE, imageName, mimetype));
}
// return effective dpi or default pdfbox ppi if dpi is null or out of reasonable range
private int effectiveDpi(Integer dpi)
{
if (dpi == null || dpi < MIN_REASONABLE_DPI || dpi > MAX_REASONABLE_DPI)
{
return (int) PDFBOX_POINTS_PER_INCH;
}
return dpi;
}
private void scaleAndDrawImage(final PDDocument pdfDocument, final BufferedImage bufferedImage, final String pdfFormat, final String pdfOrientation, final Map<String, Integer> resolution)
throws IOException
{
@@ -156,8 +168,10 @@ public class ImageToPdfTransformer implements CustomTransformerFileAdaptor
if (resolution.get("X") > 0 && resolution.get("X") != PDFBOX_POINTS_PER_INCH &&
resolution.get("Y") > 0 && resolution.get("Y") != PDFBOX_POINTS_PER_INCH)
{
imageWidth = (int) (((float) imageWidth / resolution.get("X")) * PDFBOX_POINTS_PER_INCH);
imageHeight = (int) (((float) imageHeight / resolution.get("Y")) * PDFBOX_POINTS_PER_INCH);
final int xRes = effectiveDpi(resolution.get("X"));
final int yRes = effectiveDpi(resolution.get("Y"));
imageWidth = (int) (((float) imageWidth / xRes) * PDFBOX_POINTS_PER_INCH);
imageHeight = (int) (((float) imageHeight / yRes) * PDFBOX_POINTS_PER_INCH);
}
final PDPage pdfPage = new PDPage(resolvePdfFormat(pdfFormat, pdfOrientation, imageWidth, imageHeight));

1
engines/misc/src/test/java/org/alfresco/transform/misc/transformers/ImageToPdfTransformerTest.java
View File

@@ -293,6 +293,7 @@ class ImageToPdfTransformerTest
{
return Stream.of(
Arguments.of(ImageFile.of("MNT-24205.tiff", MIMETYPE_IMAGE_TIFF), 612.0f, 792.0f),
Arguments.of(ImageFile.of("459x594-1.tiff", MIMETYPE_IMAGE_TIFF), 459.0f, 594.0f),
Arguments.of(ImageFile.of("459x594-50.tif", MIMETYPE_IMAGE_TIFF), 660.0f, 855.0f),
Arguments.of(ImageFile.of("459x594-72.tif", MIMETYPE_IMAGE_TIFF), 459.0f, 594.0f),
Arguments.of(ImageFile.of("459x594-300.tif", MIMETYPE_IMAGE_TIFF), 110.0f, 142.0f),

BIN
engines/misc/src/test/resources/459x594-1.tiff Normal file
View File

Binary file not shown.