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 2017/02/18 16:46:59 UTC

svn commit: r1783572 - in /pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox: contentstream/operator/graphics/BeginInlineImage.java pdfparser/PDFStreamParser.java

Author: tilman
Date: Sat Feb 18 16:46:59 2017
New Revision: 1783572

URL: http://svn.apache.org/viewvc?rev=1783572&view=rev
Log:
PDFBOX-3694: warn and skip empty inline images

Modified:
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/BeginInlineImage.java
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/PDFStreamParser.java

Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/BeginInlineImage.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/BeginInlineImage.java?rev=1783572&r1=1783571&r2=1783572&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/BeginInlineImage.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/graphics/BeginInlineImage.java Sat Feb 18 16:46:59 2017
@@ -34,6 +34,10 @@ public final class BeginInlineImage exte
     @Override
     public void process(Operator operator, List<COSBase> operands) throws IOException
     {
+        if (operator.getImageData().length == 0)
+        {
+            return;
+        }
         PDImage image = new PDInlineImage(operator.getImageParameters(),
                                           operator.getImageData(),
                                           context.getResources());

Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/PDFStreamParser.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/PDFStreamParser.java?rev=1783572&r1=1783571&r2=1783572&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/PDFStreamParser.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/PDFStreamParser.java Sat Feb 18 16:46:59 2017
@@ -286,6 +286,10 @@ public class PDFStreamParser extends Bas
                     }
                     //final token will be the image data, maybe??
                     Operator imageData = (Operator)nextToken;
+                    if (imageData.getImageData().length == 0)
+                    {
+                        LOG.warn("empty inline image at stream offset " + seqSource.getPosition());
+                    }
                     beginImageOP.setImageData( imageData.getImageData() );
                 }
                 break;