Merge pull request #555 from sbplat/main

feat: merge pdf into multiple frames if the format is TIFF
Stirling-Tools · Dec 25, 2023 · 9652f59 · 9652f59
2 parents 491be75 + 3469beb
commit 9652f59
Showing 1 changed file with 38 additions and 12 deletions.
diff --git a/src/main/java/stirling/software/SPDF/utils/PdfUtils.java b/src/main/java/stirling/software/SPDF/utils/PdfUtils.java
@@ -16,7 +16,11 @@
 import java.util.zip.ZipOutputStream;
 
 import javax.imageio.ImageIO;
+import javax.imageio.IIOImage;
 import javax.imageio.ImageReader;
+import javax.imageio.ImageWriter;
+import javax.imageio.ImageWriteParam;
+import javax.imageio.stream.ImageOutputStream;
 
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDPage;
@@ -206,21 +210,43 @@ public static byte[] convertFromPdf(byte[] inputStream, String imageType, ImageT
                 images.add(pdfRenderer.renderImageWithDPI(i, DPI, colorType));
             }
 
-            if (singleImage) {
-                // Combine all images into a single big image
-                BufferedImage combined = new BufferedImage(images.get(0).getWidth(), images.get(0).getHeight() * pageCount, BufferedImage.TYPE_INT_RGB);
-                Graphics g = combined.getGraphics();
-                for (int i = 0; i < images.size(); i++) {
-                    g.drawImage(images.get(i), 0, i * images.get(0).getHeight(), null);
-                }
-                images = Arrays.asList(combined);
-            }
-
             // Create a ByteArrayOutputStream to save the image(s) to
             ByteArrayOutputStream baos = new ByteArrayOutputStream();
+
             if (singleImage) {
-                // Write the image to the output stream
-                ImageIO.write(images.get(0), imageType, baos);
+                if (imageType.toLowerCase().equals("tiff") || imageType.toLowerCase().equals("tif")) {
+                    // Write the images to the output stream as a TIFF with multiple frames
+                    ImageWriter writer = ImageIO.getImageWritersByFormatName("tiff").next();
+                    ImageWriteParam param = writer.getDefaultWriteParam();
+                    param.setCompressionMode(ImageWriteParam.MODE_EXPLICIT);
+                    param.setCompressionType("ZLib");
+                    param.setCompressionQuality(1.0f);
+
+                    try (ImageOutputStream ios = ImageIO.createImageOutputStream(baos)) {
+                        writer.setOutput(ios);
+                        writer.prepareWriteSequence(null);
+
+                        for (int i = 0; i < images.size(); ++i) {
+                            BufferedImage image = images.get(i);
+                            writer.writeToSequence(new IIOImage(image, null, null), param);
+                        }
+
+                        writer.endWriteSequence();
+                    }
+
+                    writer.dispose();
+                } else {
+                    // Combine all images into a single big image
+                    BufferedImage combined = new BufferedImage(images.get(0).getWidth(), images.get(0).getHeight() * pageCount, BufferedImage.TYPE_INT_RGB);
+                    Graphics g = combined.getGraphics();
+
+                    for (int i = 0; i < images.size(); i++) {
+                        g.drawImage(images.get(i), 0, i * images.get(0).getHeight(), null);
+                    }
+
+                    // Write the image to the output stream
+                    ImageIO.write(combined, imageType, baos);
+                }
 
                 // Log that the image was successfully written to the byte array
                 logger.info("Image successfully written to byte array");