svn commit: r1620482 - in /pdfbox/branches/no-awt/pdfbox/src/main/java/org/apache/pdfbox: pdmodel/common/PDMatrix.java pdmodel/graphics/color/PDCalRGB.java rendering/PageDrawer.java util/Matrix.java

[ja...@apache.org]

Author: jahewson
Date: Mon Aug 25 23:23:53 2014
New Revision: 1620482

URL: http://svn.apache.org/r1620482
Log:
PDFBOX-2262: Removed redundant PDMatrix class

Removed:
    pdfbox/branches/no-awt/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/common/PDMatrix.java
Modified:
    pdfbox/branches/no-awt/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDCalRGB.java
    pdfbox/branches/no-awt/pdfbox/src/main/java/org/apache/pdfbox/rendering/PageDrawer.java
    pdfbox/branches/no-awt/pdfbox/src/main/java/org/apache/pdfbox/util/Matrix.java

Modified: pdfbox/branches/no-awt/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDCalRGB.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/no-awt/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDCalRGB.java?rev=1620482&r1=1620481&r2=1620482&view=diff
==============================================================================
--- pdfbox/branches/no-awt/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDCalRGB.java (original)
+++ pdfbox/branches/no-awt/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDCalRGB.java Mon Aug 25 23:23:53 2014
@@ -22,7 +22,7 @@ import org.apache.pdfbox.cos.COSDictiona
 import org.apache.pdfbox.cos.COSFloat;
 import org.apache.pdfbox.cos.COSName;
 
-import org.apache.pdfbox.pdmodel.common.PDMatrix;
+import org.apache.pdfbox.util.Matrix;
 
 /**
  * A CalRGB colour space is a CIE-based colour space with one transformation stage instead of two.
@@ -151,16 +151,16 @@ public class PDCalRGB extends PDCIEBased
      * If the underlying dictionary contains null then the identity matrix will be returned.
      * @return the linear interpretation matrix
      */
-    public final PDMatrix getGammaMatrix()
+    public final Matrix getGammaMatrix()
     {
         COSArray matrix = (COSArray)dictionary.getDictionaryObject(COSName.MATRIX);
         if(matrix == null)
         {
-            return new PDMatrix();
+            return new Matrix();
         }
         else
         {
-           return new PDMatrix(matrix);
+           return new Matrix(matrix);
         }
     }
 
@@ -210,12 +210,12 @@ public class PDCalRGB extends PDCIEBased
      * Passing in null will clear the matrix.
      * @param matrix the new linear interpretation matrix, or null
      */
-    public final void setGammaMatrix(PDMatrix matrix)
+    public final void setGammaMatrix(Matrix matrix)
     {
         COSArray matrixArray = null;
         if(matrix != null)
         {
-            matrixArray = matrix.getCOSArray();
+            matrixArray = matrix.toCOSArray();
         }
         dictionary.setItem(COSName.MATRIX, matrixArray);
     }

Modified: pdfbox/branches/no-awt/pdfbox/src/main/java/org/apache/pdfbox/rendering/PageDrawer.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/no-awt/pdfbox/src/main/java/org/apache/pdfbox/rendering/PageDrawer.java?rev=1620482&r1=1620481&r2=1620482&view=diff
==============================================================================
--- pdfbox/branches/no-awt/pdfbox/src/main/java/org/apache/pdfbox/rendering/PageDrawer.java (original)
+++ pdfbox/branches/no-awt/pdfbox/src/main/java/org/apache/pdfbox/rendering/PageDrawer.java Mon Aug 25 23:23:53 2014
@@ -51,7 +51,6 @@ import org.apache.pdfbox.rendering.font.
 import org.apache.pdfbox.rendering.font.Type1Glyph2D;
 import org.apache.pdfbox.pdmodel.PDPage;
 import org.apache.pdfbox.pdmodel.PDResources;
-import org.apache.pdfbox.pdmodel.common.PDMatrix;
 import org.apache.pdfbox.pdmodel.common.PDRectangle;
 import org.apache.pdfbox.pdmodel.font.PDFont;
 import org.apache.pdfbox.pdmodel.font.PDTrueTypeFont;

Modified: pdfbox/branches/no-awt/pdfbox/src/main/java/org/apache/pdfbox/util/Matrix.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/no-awt/pdfbox/src/main/java/org/apache/pdfbox/util/Matrix.java?rev=1620482&r1=1620481&r2=1620482&view=diff
==============================================================================
--- pdfbox/branches/no-awt/pdfbox/src/main/java/org/apache/pdfbox/util/Matrix.java (original)
+++ pdfbox/branches/no-awt/pdfbox/src/main/java/org/apache/pdfbox/util/Matrix.java Mon Aug 25 23:23:53 2014
@@ -17,6 +17,7 @@
 package org.apache.pdfbox.util;
 
 import org.apache.pdfbox.cos.COSArray;
+import org.apache.pdfbox.cos.COSFloat;
 import org.apache.pdfbox.cos.COSNumber;
 
 import java.awt.geom.AffineTransform;
@@ -434,4 +435,19 @@ public class Matrix implements Cloneable
     {
         return single[7];
     }
+
+    /**
+     * Returns a COS array which represnets this matrix.
+     */
+    public COSArray toCOSArray()
+    {
+        COSArray array = new COSArray();
+        array.add(new COSFloat(0));
+        array.add(new COSFloat(1));
+        array.add(new COSFloat(3));
+        array.add(new COSFloat(4));
+        array.add(new COSFloat(6));
+        array.add(new COSFloat(7));
+        return array;
+    }
 }