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 2019/11/22 16:27:35 UTC

svn commit: r1870170 - in /pdfbox/trunk/pdfbox/src: main/java/org/apache/pdfbox/pdmodel/interactive/form/PDAcroForm.java test/java/org/apache/pdfbox/pdmodel/interactive/form/PDAcroFormFlattenTest.java

Author: tilman
Date: Fri Nov 22 16:27:35 2019
New Revision: 1870170

URL: http://svn.apache.org/viewvc?rev=1870170&view=rev
Log:
PDFBOX-4693: consider rotation of the appearance stream matrix instead of the page rotation

Modified:
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDAcroForm.java
    pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/PDAcroFormFlattenTest.java

Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDAcroForm.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDAcroForm.java?rev=1870170&r1=1870169&r2=1870170&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDAcroForm.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDAcroForm.java Fri Nov 22 16:27:35 2019
@@ -347,6 +347,10 @@ public final class PDAcroForm implements
                         transformed = true;
                     }
 
+                    Matrix m = appearanceStream.getMatrix();
+                    int angle = (int) Math.round(Math.toDegrees(Math.atan2(m.getShearY(), m.getScaleY())));
+                    int rotation = (angle + 360) % 360;
+
                     if (needsScaling)
                     {
                         PDRectangle bbox = appearanceStream.getBBox();
@@ -354,7 +358,7 @@ public final class PDAcroForm implements
 
                         float xScale;
                         float yScale;
-                        if (page.getRotation() == 90 || page.getRotation() == 270)
+                        if (rotation == 90 || rotation == 270)
                         {
                             xScale = fieldRect.getWidth() / bbox.getHeight();
                             yScale = fieldRect.getHeight() / bbox.getWidth();

Modified: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/PDAcroFormFlattenTest.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/PDAcroFormFlattenTest.java?rev=1870170&r1=1870169&r2=1870170&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/PDAcroFormFlattenTest.java (original)
+++ pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/interactive/form/PDAcroFormFlattenTest.java Fri Nov 22 16:27:35 2019
@@ -245,6 +245,18 @@ public class PDAcroFormFlattenTest {
         flattenAndCompare(sourceUrl, targetFileName);
     }
 
+    /**
+     * PDFBOX-4693: page is not rotated, but the appearance stream is.
+     */
+    // @Test
+    public void testFlattenPDFBox4693() throws IOException
+    {
+        String sourceUrl = "https://issues.apache.org/jira/secure/attachment/12986337/stenotypeTest-3_rotate_no_flatten.pdf";
+        String targetFileName = "PDFBOX-4693-filled.pdf";
+
+        flattenAndCompare(sourceUrl, targetFileName);
+    }
+
     /*
      * Flatten and compare with generated image samples.
      */