XGC-146: Convert WebP to JPEG

Author: simonsteiner1984

src/main/java/org/apache/xmlgraphics/image/loader/impl/imageio/ImageLoaderImageIO.java

@@ -32,6 +32,7 @@
 import java.awt.image.Raster;
 import java.awt.image.RenderedImage;
 import java.awt.image.WritableRaster;
+import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.FileNotFoundException;
 import java.io.IOException;
@@ -45,15 +46,19 @@
 import java.util.zip.Inflater;
 
 import javax.imageio.IIOException;
+import javax.imageio.IIOImage;
 import javax.imageio.ImageIO;
 import javax.imageio.ImageReadParam;
 import javax.imageio.ImageReader;
 import javax.imageio.ImageTypeSpecifier;
+import javax.imageio.ImageWriteParam;
+import javax.imageio.ImageWriter;
 import javax.imageio.metadata.IIOMetadata;
 import javax.imageio.metadata.IIOMetadataFormatImpl;
 import javax.imageio.metadata.IIOMetadataNode;
 import javax.imageio.spi.IIOServiceProvider;
 import javax.imageio.stream.ImageInputStream;
+import javax.imageio.stream.ImageOutputStream;
 import javax.xml.transform.Source;
 
 import org.w3c.dom.Element;
@@ -69,8 +74,10 @@
 import org.apache.xmlgraphics.image.loader.ImageSessionContext;
 import org.apache.xmlgraphics.image.loader.impl.AbstractImageLoader;
 import org.apache.xmlgraphics.image.loader.impl.ImageBuffered;
+import org.apache.xmlgraphics.image.loader.impl.ImageRawJPEG;
 import org.apache.xmlgraphics.image.loader.impl.ImageRendered;
 import org.apache.xmlgraphics.image.loader.util.ImageUtil;
+
 import org.apache.xmlgraphics.io.XmlSourceUtil;
 import org.apache.xmlgraphics.java2d.color.profile.ColorProfileUtil;
 
@@ -251,6 +258,10 @@ public Image loadImage(ImageInfo info, Map<String, Object> hints, ImageSessionCo
             }
         }
 
+        if ("image/webp".equals(info.getMimeType()) && !hints.containsKey("CMYK")) {
+            //skip for AFP by checking hints map
+            return convertToJPEG(info, imageData);
+        }
         if (ImageFlavor.BUFFERED_IMAGE.equals(this.targetFlavor)) {
             imageData = rgbToCmyk((BufferedImage) imageData, info, session);
             return new ImageBuffered(info, (BufferedImage)imageData, transparentColor);
@@ -259,6 +270,21 @@ public Image loadImage(ImageInfo info, Map<String, Object> hints, ImageSessionCo
         }
     }
 
+    private ImageRawJPEG convertToJPEG(ImageInfo info, RenderedImage imageData) throws IOException {
+        ImageWriter jpgWriter = ImageIO.getImageWritersByFormatName("jpg").next();
+        ImageWriteParam jpgWriteParam = jpgWriter.getDefaultWriteParam();
+        jpgWriteParam.setCompressionMode(ImageWriteParam.MODE_EXPLICIT);
+        jpgWriteParam.setCompressionQuality(0.8f);
+        ByteArrayOutputStream bos = new ByteArrayOutputStream();
+        ImageOutputStream outputStream = ImageIO.createImageOutputStream(bos);
+        jpgWriter.setOutput(outputStream);
+        IIOImage outputImage = new IIOImage(imageData, null, null);
+        jpgWriter.write(null, outputImage, jpgWriteParam);
+        jpgWriter.dispose();
+        return new ImageRawJPEG(info, new ByteArrayInputStream(bos.toByteArray()), 0,
+                imageData.getColorModel().getColorSpace(), null, false);
+    }
+
     /**
      * Convert RGB to CMYK using ICC file passed via fop.xconf
      */

src/test/java/org/apache/xmlgraphics/image/loader/impl/ImageLoaderImageIOTestCase.java

@@ -22,6 +22,7 @@
 import java.awt.image.BufferedImage;
 import java.io.File;
 import java.net.URL;
+import java.util.HashMap;
 
 import org.junit.Assert;
 import org.junit.Test;
@@ -74,4 +75,14 @@ public void testRGBToCMYK() throws Exception {
         Assert.assertEquals(image.getBufferedImage().getType(), BufferedImage.TYPE_CUSTOM);
         Assert.assertEquals(image.getBufferedImage().getColorModel().getNumColorComponents(), 4);
     }
+
+    @Test
+    public void testWebP() throws Exception {
+        //Use jpg file to avoid need for TwelveMonkeys jars
+        File file = new File("test/images/bgimg300dpi.jpg");
+        ImageInfo info = new ImageInfo(file.toURI().toASCIIString(), "image/webp");
+        Image image = new ImageLoaderImageIO(ImageFlavor.BUFFERED_IMAGE)
+                .loadImage(info, new HashMap<>(), new MockImageSessionContext(MockImageContext.newSafeInstance()));
+        Assert.assertTrue(image instanceof ImageRawJPEG);
+    }
 }