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 2014/12/21 21:18:45 UTC

svn commit: r1647203 - in /pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox: pdmodel/graphics/form/PDFormXObject.java util/LayerUtility.java

Author: tilman
Date: Sun Dec 21 20:18:45 2014
New Revision: 1647203

URL: http://svn.apache.org/r1647203
Log:
PDFBOX-2576: getMatrix is never null, fix javadoc

Modified:
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/form/PDFormXObject.java
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/LayerUtility.java

Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/form/PDFormXObject.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/form/PDFormXObject.java?rev=1647203&r1=1647202&r2=1647203&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/form/PDFormXObject.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/form/PDFormXObject.java Sun Dec 21 20:18:45 2014
@@ -191,7 +191,7 @@ public class PDFormXObject extends PDXOb
 
     /**
      * This will get the optional Matrix of an XObjectForm. It maps the form space to user space.
-     * @return the form matrix
+     * @return the form matrix if available, or the identity matrix.
      */
     @Override
     public Matrix getMatrix()

Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/LayerUtility.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/LayerUtility.java?rev=1647203&r1=1647202&r2=1647203&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/LayerUtility.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/LayerUtility.java Sun Dec 21 20:18:45 2014
@@ -162,7 +162,7 @@ public class LayerUtility
         transferDict(page.getCOSObject(), form.getCOSStream(), PAGE_TO_FORM_FILTER, true);
 
         Matrix matrix = form.getMatrix();
-        AffineTransform at = matrix != null ? matrix.createAffineTransform() : new AffineTransform();
+        AffineTransform at = matrix.createAffineTransform();
         PDRectangle mediaBox = page.getMediaBox();
         PDRectangle cropBox = page.getCropBox();
         PDRectangle viewBox = (cropBox != null ? cropBox : mediaBox);