Upgrade PDFBox API to v2.0.19 (#396)

Author: TomRoush

library/src/androidTest/java/com/tom_roush/pdfbox/pdfwriter/ContentStreamWriterTest.java

@@ -0,0 +1,131 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.tom_roush.pdfbox.pdfwriter;
+
+import android.content.Context;
+import android.graphics.Bitmap;
+
+import androidx.test.platform.app.InstrumentationRegistry;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+
+import com.tom_roush.pdfbox.android.PDFBoxResourceLoader;
+import com.tom_roush.pdfbox.android.TestResourceGenerator;
+import com.tom_roush.pdfbox.cos.COSName;
+import com.tom_roush.pdfbox.pdfparser.PDFStreamParser;
+import com.tom_roush.pdfbox.pdmodel.PDDocument;
+import com.tom_roush.pdfbox.pdmodel.PDPage;
+import com.tom_roush.pdfbox.pdmodel.common.PDStream;
+import com.tom_roush.pdfbox.rendering.PDFRenderer;
+import com.tom_roush.pdfbox.rendering.TestRendering;
+
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+import static org.junit.Assume.assumeTrue;
+
+/**
+ *
+ * @author Tilman Hausherr
+ */
+public class ContentStreamWriterTest
+{
+
+   private File testDirIn;
+   private File testDirOut;
+
+   private Context testContext;
+
+   public ContentStreamWriterTest()
+   {
+   }
+
+   @BeforeClass
+   public static void setUpClass()
+   {
+   }
+
+   @AfterClass
+   public static void tearDownClass()
+   {
+   }
+
+   @Before
+   public void setUp()
+   {
+      testContext = InstrumentationRegistry.getInstrumentation().getContext();
+      PDFBoxResourceLoader.init(testContext);
+
+      testDirIn = new File(testContext.getCacheDir(), "pdfs");
+      testDirIn.mkdirs();
+      testDirOut = new File(testContext.getCacheDir(), "pdfbox-test-output/contentstream");
+      testDirOut.mkdirs();
+   }
+
+   @After
+   public void tearDown()
+   {
+   }
+
+   /**
+    * Test parse content stream, write back tokens and compare rendering.
+    *
+    * @throws java.io.IOException
+    */
+   @Test
+   public void testPDFBox4750() throws IOException
+   {
+      String filename = "PDFBOX-4750.pdf";
+      File file = TestResourceGenerator.downloadTestResource(testDirIn, filename, "https://issues.apache.org/jira/secure/attachment/12991833/PDFBOX-4750-test.pdf");
+      assumeTrue(file.exists());
+      PDDocument doc = PDDocument.load(file);
+
+      PDFRenderer r = new PDFRenderer(doc);
+      for (int i = 0; i < doc.getNumberOfPages(); ++i)
+      {
+         Bitmap bim1 = r.renderImageWithDPI(i, 96);
+         FileOutputStream fileOut = new FileOutputStream(new File(testDirOut, filename + "-" + (i + 1) + ".png"));
+         bim1.compress(Bitmap.CompressFormat.PNG, 100, fileOut);
+         fileOut.close();
+
+         PDPage page = doc.getPage(i);
+         PDStream newContent = new PDStream(doc);
+
+         PDFStreamParser parser = new PDFStreamParser(page);
+         parser.parse();
+         OutputStream os = newContent.createOutputStream(COSName.FLATE_DECODE);
+         ContentStreamWriter tokenWriter = new ContentStreamWriter(os);
+         tokenWriter.writeTokens(parser.getTokens());
+         os.close();
+
+         page.setContents(newContent);
+      }
+      doc.save(new File(testDirOut, filename));
+      doc.close();
+
+      File renderFile = new File(testDirOut, filename);
+      TestRendering testRendering = new TestRendering();
+      testRendering.setUp();
+      testRendering.render(renderFile);
+   }
+}

library/src/androidTest/java/com/tom_roush/pdfbox/pdmodel/interactive/form/AlignmentTest.java

@@ -38,7 +38,7 @@ public class AlignmentTest
     private static final String NAME_OF_PDF = "AlignmentTests.pdf";
     private static final String TEST_VALUE = "sdfASDF1234äöü";
 
-    Context testContext;
+    private Context testContext;
 
     private PDDocument document;
     private PDAcroForm acroForm;

library/src/androidTest/java/com/tom_roush/pdfbox/pdmodel/interactive/form/PDAcroFormFlattenTest.java

@@ -42,7 +42,7 @@
 /**
  * Test flatten different forms and compare with rendering.
  *
- * The tests are currently disabled to not run within the CI environment
+ * Some of the tests are currently disabled to not run within the CI environment
  * as the test results need manual inspection. Enable as needed.
  *
  */
@@ -70,7 +70,7 @@ public void setUp()
    /*
     * PDFBOX-142 Filled template.
     */
-   @Test
+   // @Test
    public void testFlattenPDFBOX142() throws IOException
    {
       String sourceUrl = "https://issues.apache.org/jira/secure/attachment/12742551/Testformular1.pdf";
@@ -130,7 +130,7 @@ public void testFlattenPDFBOX2586() throws IOException
    /*
     * PDFBOX-3083 Filled template rotated.
     */
-   @Test
+   // @Test
    public void testFlattenPDFBOX3083() throws IOException
    {
       String sourceUrl = "https://issues.apache.org/jira/secure/attachment/12770263/mypdf.pdf";
@@ -202,7 +202,7 @@ public void testFlattenPDFBOX3396_4() throws IOException
    /*
     * PDFBOX-3587 Empty template.
     */
-   @Test
+   // @Test
    public void testFlattenOpenOfficeForm() throws IOException
    {
       String sourceUrl = "https://issues.apache.org/jira/secure/attachment/12839977/OpenOfficeForm.pdf";
@@ -214,7 +214,7 @@ public void testFlattenOpenOfficeForm() throws IOException
    /*
     * PDFBOX-3587 Filled template.
     */
-   @Test
+   // @Test
    public void testFlattenOpenOfficeFormFilled() throws IOException
    {
       String sourceUrl = "https://issues.apache.org/jira/secure/attachment/12840280/OpenOfficeForm_filled.pdf";
@@ -226,7 +226,7 @@ public void testFlattenOpenOfficeFormFilled() throws IOException
    /**
     * PDFBOX-4157 Filled template.
     */
-   @Test
+   // @Test
    public void testFlattenPDFBox4157() throws IOException
    {
       String sourceUrl = "https://issues.apache.org/jira/secure/attachment/12976553/PDFBOX-4157-filled.pdf";
@@ -238,7 +238,7 @@ public void testFlattenPDFBox4157() throws IOException
    /**
     * PDFBOX-4172 Filled template.
     */
-   @Test
+   // @Test
    public void testFlattenPDFBox4172() throws IOException
    {
       String sourceUrl = "https://issues.apache.org/jira/secure/attachment/12976552/PDFBOX-4172-filled.pdf";
@@ -250,7 +250,7 @@ public void testFlattenPDFBox4172() throws IOException
    /**
     * PDFBOX-4615 Filled template.
     */
-   @Test
+   // @Test
    public void testFlattenPDFBox4615() throws IOException
    {
       String sourceUrl = "https://issues.apache.org/jira/secure/attachment/12976452/resetboundingbox-filled.pdf";
@@ -368,7 +368,7 @@ public boolean accept(File dir, String name)
 
       for (File testFile : testFiles)
       {
-         if (! new File(OUT_DIR, testFile.getName()).exists())
+         if (!new File(OUT_DIR, testFile.getName()).exists())
          {
             testFile.delete();
          }

library/src/main/java/com/tom_roush/fontbox/cff/CFFParser.java

@@ -407,7 +407,14 @@ private static Double readRealNumber(CFFDataInput input, int b0) throws IOExcept
         {
             return 0d;
         }
-        return Double.valueOf(sb.toString());
+        try
+        {
+            return Double.valueOf(sb.toString());
+        }
+        catch (NumberFormatException ex)
+        {
+            throw new IOException(ex);
+        }
     }
 
     private CFFFont parseFont(CFFDataInput input, String name, byte[] topDictIndex) throws IOException

library/src/main/java/com/tom_roush/fontbox/cff/Type1CharString.java

@@ -38,7 +38,8 @@
 public class Type1CharString
 {
     private Type1CharStringReader font;
-    private final String fontName, glyphName;
+    private final String fontName;
+    private final String glyphName;
     private Path path = null;
     private int width = 0;
     private PointF leftSideBearing = null;
@@ -173,7 +174,7 @@ private List<Number> handleCommand(List<Number> numbers, CharStringCommand comma
         }
         else if ("vmoveto".equals(name))
         {
-            if (numbers.size() >= 1)
+            if (!numbers.isEmpty())
             {
                 if (isFlex)
                 {
@@ -188,7 +189,7 @@ else if ("vmoveto".equals(name))
         }
         else if ("hmoveto".equals(name))
         {
-            if (numbers.size() >= 1)
+            if (!numbers.isEmpty())
             {
                 if (isFlex)
                 {
@@ -210,14 +211,14 @@ else if ("rlineto".equals(name))
         }
         else if ("hlineto".equals(name))
         {
-            if (numbers.size() >= 1)
+            if (!numbers.isEmpty())
             {
                 rlineTo(numbers.get(0), 0);
             }
         }
         else if ("vlineto".equals(name))
         {
-            if (numbers.size() >= 1)
+            if (!numbers.isEmpty())
             {
                 rlineTo(0, numbers.get(0));
             }
@@ -284,7 +285,7 @@ else if ("setcurrentpoint".equals(name))
         }
         else if ("callothersubr".equals(name))
         {
-            if (numbers.size() >= 1)
+            if (!numbers.isEmpty())
             {
                 callothersubr(numbers.get(0).intValue());
             }
@@ -441,7 +442,7 @@ private void rrcurveTo(Number dx1, Number dy1, Number dx2, Number dy2,
         }
         else
         {
-            path.cubicTo(x1, y1, x2, y2, x3, y3); // TODO: PdfBox-Android Should this be relative?
+            path.cubicTo(x1, y1, x2, y2, x3, y3);
         }
         current.set(x3, y3);
     }

library/src/main/java/com/tom_roush/fontbox/cff/Type1CharStringParser.java

@@ -42,7 +42,8 @@ public class Type1CharStringParser
     static final int CALLOTHERSUBR = 16;
     static final int POP = 17;
 
-    private final String fontName, glyphName;
+    private final String fontName;
+    private final String glyphName;
 
     /**
      * Constructs a new Type1CharStringParser object.

library/src/main/java/com/tom_roush/fontbox/cff/Type2CharString.java

@@ -211,7 +211,7 @@ else if ("hstemhm".equals(name))
         else if ("hintmask".equals(name) || "cntrmask".equals(name))
         {
             numbers = clearStack(numbers, numbers.size() % 2 != 0);
-            if (numbers.size() > 0)
+            if (!numbers.isEmpty())
             {
                 expandStemHints(numbers, false);
             }
@@ -308,7 +308,7 @@ private void closePath()
 
     private void drawAlternatingLine(List<Number> numbers, boolean horizontal)
     {
-        while (numbers.size() > 0)
+        while (!numbers.isEmpty())
         {
             addCommand(numbers.subList(0, 1), new CharStringCommand(
                 horizontal ? 6 : 7));

library/src/main/java/com/tom_roush/fontbox/cff/Type2CharStringParser.java

@@ -31,7 +31,9 @@ public class Type2CharStringParser
     private int vstemCount = 0;
     private List<Object> sequence = null;
     @SuppressWarnings("unused")
-    private final String fontName, glyphName;
+    private final String fontName;
+    @SuppressWarnings("unused")
+    private final String glyphName;
 
     /**
      * Constructs a new Type1CharStringParser object for a Type 1-equivalent font.

library/src/main/java/com/tom_roush/fontbox/cmap/CMapParser.java

@@ -392,10 +392,28 @@ else if (nextToken instanceof byte[])
                 // PDFBOX-3450: ignore <>
                 if (tokenBytes.length > 0)
                 {
-                    // PDFBOX-4661: avoid overflow of the last byte, all following values are undefined
-                    int values = Math.min(end - start,
-                        255 - (tokenBytes[tokenBytes.length - 1] & 0xFF)) + 1;
-                    addMappingFrombfrange(result, startCode, values, tokenBytes);
+                    // PDFBOX-4720:
+                    // some pdfs use the malformed bfrange <0000> <FFFF> <0000>. Add support by adding a identity
+                    // mapping for the whole range instead of cutting it after 255 entries
+                    // TODO find a more efficient method to represent all values for a identity mapping
+                    if (tokenBytes.length == 2 && start == 0 && end == 0xffff
+                        && tokenBytes[0] == 0 && tokenBytes[1] == 0)
+                    {
+                        for (int i = 0; i < 256; i++)
+                        {
+                            startCode[1] = (byte) i;
+                            tokenBytes[1] = (byte) i;
+                            addMappingFrombfrange(result, startCode, 0xff, tokenBytes);
+
+                        }
+                    }
+                    else
+                    {
+                        // PDFBOX-4661: avoid overflow of the last byte, all following values are undefined
+                        int values = Math.min(end - start,
+                            255 - (tokenBytes[tokenBytes.length - 1] & 0xFF)) + 1;
+                        addMappingFrombfrange(result, startCode, values, tokenBytes);
+                    }
                 }
             }
         }

library/src/main/java/com/tom_roush/fontbox/ttf/BufferedRandomAccessFile.java

@@ -36,7 +36,7 @@ public class BufferedRandomAccessFile extends RandomAccessFile
     /**
      * Uses a byte instead of a char buffer for efficiency reasons.
      */
-    private final byte buffer[];
+    private final byte[] buffer;
     private int bufend = 0;
     private int bufpos = 0;
 
@@ -146,7 +146,7 @@ private void invalidate() throws IOException
      * {@inheritDoc}
      */
     @Override
-    public int read(byte b[], int off, int len) throws IOException
+    public int read(byte[] b, int off, int len) throws IOException
     {
         int leftover = bufend - bufpos;
         if (len <= leftover)