Merged in task/dspace-cris-2024_02_x/DSC-2830 (pull request DSpace#5751)

DSC-2830

Approved-by: Mykhaylo Boychuk

Author: vins01-4science

dspace-api/src/main/java/org/dspace/app/mediafilter/BrandedPreviewJPEGFilter.java

@@ -7,9 +7,7 @@
  */
 package org.dspace.app.mediafilter;
 
-import java.awt.image.BufferedImage;
 import java.io.InputStream;
-import javax.imageio.ImageIO;
 
 import org.dspace.content.Item;
 import org.dspace.services.ConfigurationService;
@@ -55,25 +53,20 @@ public String getDescription() {
     @Override
     public InputStream getDestinationStream(Item currentItem, InputStream source, boolean verbose)
         throws Exception {
-        // read in bitstream's image
-        BufferedImage buf = ImageIO.read(source);
-
         // get config params
         ConfigurationService configurationService
                 = DSpaceServicesFactory.getInstance().getConfigurationService();
-        float xmax = (float) configurationService
-            .getIntProperty("webui.preview.maxwidth");
-        float ymax = (float) configurationService
-            .getIntProperty("webui.preview.maxheight");
-        boolean blurring = (boolean) configurationService
-            .getBooleanProperty("webui.preview.blurring");
-        boolean hqscaling = (boolean) configurationService
-            .getBooleanProperty("webui.preview.hqscaling");
+        int xmax = configurationService.getIntProperty("webui.preview.maxwidth");
+        int ymax = configurationService.getIntProperty("webui.preview.maxheight");
+        boolean blurring = configurationService.getBooleanProperty("webui.preview.blurring");
+        boolean hqscaling = configurationService.getBooleanProperty("webui.preview.hqscaling");
         int brandHeight = configurationService.getIntProperty("webui.preview.brand.height");
         String brandFont = configurationService.getProperty("webui.preview.brand.font");
         int brandFontPoint = configurationService.getIntProperty("webui.preview.brand.fontpoint");
 
-        return getThumbDim(currentItem, buf, verbose, xmax, ymax, blurring, hqscaling, brandHeight, brandFontPoint,
-                         brandFont);
+        JPEGFilter jpegFilter = new JPEGFilter();
+        return jpegFilter.getThumb(
+                currentItem, source, verbose, xmax, ymax, blurring, hqscaling, brandHeight, brandFontPoint, brandFont
+        );
     }
 }

dspace-api/src/main/java/org/dspace/app/mediafilter/ImageMagickThumbnailFilter.java

@@ -15,6 +15,7 @@
 import java.util.regex.PatternSyntaxException;
 
 import org.apache.pdfbox.Loader;
+import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDPage;
 import org.apache.pdfbox.pdmodel.common.PDRectangle;
 import org.dspace.content.Bitstream;
@@ -85,23 +86,20 @@ public String getDescription() {
 
     public File inputStreamToTempFile(InputStream source, String prefix, String suffix) throws IOException {
         File f = File.createTempFile(prefix, suffix);
-        f.deleteOnExit();
-        FileOutputStream fos = new FileOutputStream(f);
-
-        byte[] buffer = new byte[1024];
-        int len = source.read(buffer);
-        while (len != -1) {
-            fos.write(buffer, 0, len);
-            len = source.read(buffer);
+        try (FileOutputStream fos = new FileOutputStream(f)) {
+            byte[] buffer = new byte[8192];
+            int len = source.read(buffer);
+            while (len != -1) {
+                fos.write(buffer, 0, len);
+                len = source.read(buffer);
+            }
         }
-        fos.close();
         return f;
     }
 
     public File getThumbnailFile(File f, boolean verbose)
         throws IOException, InterruptedException, IM4JavaException {
         File f2 = new File(f.getParentFile(), f.getName() + ".jpg");
-        f2.deleteOnExit();
         ConvertCmd cmd = new ConvertCmd();
         IMOperation op = new IMOperation();
         op.autoOrient();
@@ -123,11 +121,7 @@ public File getThumbnailFile(File f, boolean verbose)
      */
     public File getImageFile(File f, boolean verbose)
         throws IOException, InterruptedException, IM4JavaException {
-        // Writing an intermediate file to disk is inefficient, but since we're
-        // doing it anyway, we should use a lossless format. IM's internal MIFF
-        // is lossless like PNG and TIFF, but much faster.
         File f2 = new File(f.getParentFile(), f.getName() + ".miff");
-        f2.deleteOnExit();
         ConvertCmd cmd = new ConvertCmd();
         IMOperation op = new IMOperation();
 
@@ -154,9 +148,15 @@ public File getImageFile(File f, boolean verbose)
         // same size as the MediaBox if it doesn't exist. Also note that we
         // only need to check the first page, since that's what we use for
         // generating the thumbnail (PDPage uses a zero-based index).
-        PDPage pdfPage = Loader.loadPDF(f).getPage(0);
-        PDRectangle pdfPageMediaBox = pdfPage.getMediaBox();
-        PDRectangle pdfPageCropBox = pdfPage.getCropBox();
+        PDRectangle pdfPageMediaBox;
+        PDRectangle pdfPageCropBox;
+        try (
+            PDDocument pdfDoc = Loader.loadPDF(f)
+        ) {
+            PDPage pdfPage = pdfDoc.getPage(0);
+            pdfPageMediaBox = pdfPage.getMediaBox();
+            pdfPageCropBox = pdfPage.getCropBox();
+        }
 
         // This option must come *before* we open the input file.
         if (pdfPageCropBox != pdfPageMediaBox) {

dspace-api/src/main/java/org/dspace/app/mediafilter/ImageMagickVideoThumbnailFilter.java

@@ -59,7 +59,6 @@ public InputStream getDestinationStream(Item currentItem, InputStream source, bo
     public File getThumbnailFile(File f, boolean verbose)
         throws IOException, InterruptedException, IM4JavaException {
         File f2 = new File(f.getParentFile(), f.getName() + ".jpg");
-        f2.deleteOnExit();
         ConvertCmd cmd = new ConvertCmd();
         IMOperation op = new IMOperation();
         op.autoOrient();