Set original type to images within ImageLoader for OpenRTF support (#1285)

Co-authored-by: Olivier Delierre <o.delierre@icloud.com>

Author: olivierDelierre

openpdf/src/main/java/com/lowagie/text/ImageLoader.java

@@ -47,6 +47,7 @@
 
 import java.awt.image.BufferedImage;
 import java.io.ByteArrayInputStream;
+import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
 import javax.imageio.ImageIO;
@@ -73,7 +74,7 @@ public class ImageLoader {
     public static Image getPngImage(URL url) {
         try (InputStream is = url.openStream()) {
             BufferedImage bufferedImage = ImageIO.read(is);
-            return Image.getInstance(bufferedImage, null, false);
+            return getImage(bufferedImage, Image.ORIGINAL_PNG);
         } catch (Exception e) {
             throw new ExceptionConverter(e);
         }
@@ -90,7 +91,7 @@ public static Image getWMFImage(URL url) {
     public static Image getGifImage(URL url) {
         try (InputStream is = url.openStream()) {
             BufferedImage bufferedImage = ImageIO.read(is);
-            return Image.getInstance(bufferedImage, null, false);
+            return getImage(bufferedImage, Image.ORIGINAL_GIF);
         } catch (Exception e) {
             throw new ExceptionConverter(e);
         }
@@ -99,7 +100,7 @@ public static Image getGifImage(URL url) {
     public static Image getTiffImage(URL url) {
         try (InputStream is = url.openStream()) {
             BufferedImage bufferedImage = ImageIO.read(is);
-            return Image.getInstance(bufferedImage, null, false);
+            return getImage(bufferedImage, Image.ORIGINAL_TIFF);
         } catch (Exception e) {
             throw new ExceptionConverter(e);
         }
@@ -109,7 +110,7 @@ public static Image getTiffImage(URL url) {
     public static Image getBmpImage(URL url) {
         try (InputStream is = url.openStream()) {
             BufferedImage bufferedImage = ImageIO.read(is);
-            return Image.getInstance(bufferedImage, null, false);
+            return getImage(bufferedImage, Image.ORIGINAL_BMP);
         } catch (Exception e) {
             throw new ExceptionConverter(e);
         }
@@ -142,7 +143,7 @@ public static Image getJpeg2000Image(URL url) {
     public static Image getGifImage(byte[] imageData) {
         try (InputStream is = new ByteArrayInputStream(imageData)) {
             BufferedImage bufferedImage = ImageIO.read(is);
-            return Image.getInstance(bufferedImage, null, false);
+            return getImage(bufferedImage, Image.ORIGINAL_GIF);
         } catch (Exception e) {
             throw new ExceptionConverter(e);
         }
@@ -151,8 +152,7 @@ public static Image getGifImage(byte[] imageData) {
     public static Image getPngImage(byte[] imageData) {
         try (InputStream is = new ByteArrayInputStream(imageData)) {
             BufferedImage bufferedImage = ImageIO.read(is);
-            return Image.getInstance(bufferedImage, null, false);
-
+            return getImage(bufferedImage, Image.ORIGINAL_PNG);
         } catch (Exception e) {
             throw new ExceptionConverter(e);
         }
@@ -169,8 +169,7 @@ public static Image getWMFImage(byte[] imageData) {
     public static Image getBmpImage(byte[] imageData) {
         try (InputStream is = new ByteArrayInputStream(imageData)) {
             BufferedImage bufferedImage = ImageIO.read(is);
-            return Image.getInstance(bufferedImage, null, false);
-
+            return getImage(bufferedImage, Image.ORIGINAL_BMP);
         } catch (Exception e) {
             throw new ExceptionConverter(e);
         }
@@ -185,8 +184,7 @@ public static Image getBmpImage(byte[] imageData) {
     public static Image getTiffImage(byte[] imageData) {
         try (InputStream is = new ByteArrayInputStream(imageData)) {
             BufferedImage bufferedImage = ImageIO.read(is);
-            return Image.getInstance(bufferedImage, null, false);
-
+            return getImage(bufferedImage, Image.ORIGINAL_TIFF);
         } catch (Exception e) {
             throw new ExceptionConverter(e);
         }
@@ -216,4 +214,9 @@ public static Image getJpeg2000Image(byte[] imageData) {
         }
     }
 
+    private static Image getImage(BufferedImage bufferedImage, int originalType) throws IOException {
+        Image image = Image.getInstance(bufferedImage, null, false);
+        image.setOriginalType(originalType);
+        return image;
+    }
 }