svn commit: r1577734 - /pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/image/JPEGFactory.java

[tilman]

Author: tilman
Date: Fri Mar 14 21:38:35 2014
New Revision: 1577734

URL: http://svn.apache.org/r1577734
Log:
PDFBOX-1969: fix JPEGFactory bug

Modified:
    
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/image/JPEGFactory.java

Modified: 
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/image/JPEGFactory.java
URL: 
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/image/JPEGFactory.java?rev=1577734&r1=1577733&r2=1577734&view=diff
==============================================================================
--- 
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/image/JPEGFactory.java
 (original)
+++ 
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/image/JPEGFactory.java
 Fri Mar 14 21:38:35 2014
@@ -18,12 +18,12 @@ package org.apache.pdfbox.pdmodel.graphi
 
 import java.awt.image.BufferedImage;
 import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
 import java.io.InputStream;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.util.Iterator;
 
-import org.apache.pdfbox.cos.COSDictionary;
 import org.apache.pdfbox.cos.COSName;
 import org.apache.pdfbox.filter.MissingImageReaderException;
 import org.apache.pdfbox.io.IOUtils;
@@ -40,6 +40,7 @@ import javax.imageio.metadata.IIOMetadat
 import javax.imageio.plugins.jpeg.JPEGImageWriteParam;
 import javax.imageio.stream.ImageInputStream;
 import javax.imageio.stream.ImageOutputStream;
+import org.apache.pdfbox.cos.COSStream;
 
 /**
  * Factory for creating a PDImageXObject containing a JPEG compressed image.
@@ -170,40 +171,15 @@ public final class JPEGFactory extends I
     {
         return createJPEG(document, image, quality, dpi);
     }
-
-    // Creates an Image XObject from a Buffered Image using JAI Image I/O
-    private static PDImageXObject createJPEG(PDDocument document, 
BufferedImage image,
-                                             float quality, int dpi) throws 
IOException
+    
+    private static void encodeImageToJPEGStream(BufferedImage image, float 
quality, int dpi, OutputStream out) 
+            throws IOException
     {
-        // extract alpha channel (if any)
-        BufferedImage awtColor = getColorImage(image);
-        BufferedImage awtAlpha = getAlphaImage(image);
-
-        // create XObject
-        PDImageXObject pdImage = new PDImageXObject(new PDStream(document), 
null);
-
-        // add DCT filter
-        COSDictionary dict = pdImage.getCOSStream();
-        pdImage.getCOSStream().setItem(COSName.FILTER, COSName.DCT_DECODE);
-
-        // alpha -> soft mask
-        if (awtAlpha != null)
-        {
-            PDImage xAlpha = JPEGFactory.createFromImage(document, awtAlpha, 
quality);
-            dict.setItem(COSName.SMASK, xAlpha);
-        }
-
-        // set properties (width, height, depth, color space, etc.)
-        setPropertiesFromAWT(awtColor, pdImage);
-
         // encode to JPEG
-        OutputStream out = null;
         ImageOutputStream ios = null;
         ImageWriter imageWriter = null;
         try
         {
-            out = pdImage.getCOSStream().createFilteredStream();
-
             // find JAI writer
             imageWriter = ImageIO.getImageWritersBySuffix("jpeg").next();
             ios = ImageIO.createImageOutputStream(out);
@@ -239,6 +215,36 @@ public final class JPEGFactory extends I
                 imageWriter.dispose();
             }
         }
+    }
+
+    // Creates an Image XObject from a Buffered Image using JAI Image I/O
+    private static PDImageXObject createJPEG(PDDocument document, 
BufferedImage image,
+                                             float quality, int dpi) throws 
IOException
+    {
+        // extract alpha channel (if any)
+        BufferedImage awtColorImage = getColorImage(image);
+        BufferedImage awtAlphaImage = getAlphaImage(image);
+
+        // create XObject
+        ByteArrayOutputStream bos = new ByteArrayOutputStream();
+        encodeImageToJPEGStream(image, quality, dpi, bos);
+        ByteArrayInputStream byteStream = new 
ByteArrayInputStream(bos.toByteArray());
+        PDImageXObject pdImage = new PDImageXObject(new PDStream(document, 
byteStream, true), null);
+        
+        // add DCT filter
+        COSStream dict = pdImage.getCOSStream();
+        dict.setItem(COSName.FILTER, COSName.DCT_DECODE);
+
+        // alpha -> soft mask
+        if (awtAlphaImage != null)
+        {
+            encodeImageToJPEGStream(awtAlphaImage, quality, dpi, 
dict.createFilteredStream());
+            PDImage xAlpha = JPEGFactory.createFromImage(document, 
awtAlphaImage, quality);
+            dict.setItem(COSName.SMASK, xAlpha);
+        }
+
+        // set properties (width, height, depth, color space, etc.)
+        setPropertiesFromAWT(awtColorImage, pdImage);
 
         return pdImage;
     }