You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by ti...@apache.org on 2018/09/27 18:24:25 UTC
svn commit: r1842137 -
/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/image/JPEGFactory.java
Author: tilman
Date: Thu Sep 27 18:24:25 2018
New Revision: 1842137
URL: http://svn.apache.org/viewvc?rev=1842137&view=rev
Log:
PDFBOX-4317: revert last 2 commits per user & Adobe feedback - problem is not because of progressive files, but because of incorrect file
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=1842137&r1=1842136&r2=1842137&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 Thu Sep 27 18:24:25 2018
@@ -39,8 +39,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.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+
import org.apache.pdfbox.cos.COSArray;
import org.apache.pdfbox.cos.COSInteger;
import org.apache.pdfbox.cos.COSName;
@@ -52,7 +51,6 @@ import org.apache.pdfbox.pdmodel.graphic
import org.apache.pdfbox.pdmodel.graphics.color.PDDeviceGray;
import org.apache.pdfbox.pdmodel.graphics.color.PDDeviceRGB;
import org.w3c.dom.Element;
-import org.w3c.dom.NodeList;
/**
* Factory for creating a PDImageXObject containing a JPEG compressed image.
@@ -60,8 +58,6 @@ import org.w3c.dom.NodeList;
*/
public final class JPEGFactory
{
- private static final Log LOG = LogFactory.getLog(JPEGFactory.class);
-
private JPEGFactory()
{
}
@@ -162,7 +158,6 @@ public final class JPEGFactory
try (ImageInputStream iis = ImageIO.createImageInputStream(stream))
{
reader.setInput(iis);
- warnIfProgressive(reader);
ImageIO.setUseCache(false);
return reader.readRaster(0, null);
}
@@ -172,34 +167,6 @@ public final class JPEGFactory
}
}
- // PDFBOX-4317 warn about progressive JPEG files
- private static void warnIfProgressive(ImageReader reader) throws IOException
- {
- // Metadata format:
- // https://docs.oracle.com/javase/10/docs/api/javax/imageio/metadata/doc-files/jpeg_metadata.html
- try
- {
- IIOMetadata imageMetadata = reader.getImageMetadata(0);
- Element tree = (Element) imageMetadata.getAsTree("javax_imageio_jpeg_image_1.0");
- Element markerSequence = (Element) tree.getElementsByTagName("markerSequence").item(0);
- NodeList nodeList = markerSequence.getElementsByTagName("sof");
- if (nodeList != null && nodeList.getLength() > 0)
- {
- Element element = (Element) nodeList.item(0);
- String process = element.getAttribute("process");
- if ("2".equals(process))
- {
- LOG.warn("Progressive JPEGs are not properly supported by Adobe Reader;");
- LOG.warn("please check whether your PDF displays.");
- }
- }
- }
- catch (IOException ex)
- {
- LOG.debug("error reading metadata", ex);
- }
- }
-
/**
* Creates a new JPEG PDImageXObject from a BufferedImage.
* <p>