pdfbox-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From le...@apache.org
Subject svn commit: r1593083 - in /pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color: PDCIEBasedColorSpace.java PDCalRGB.java PDColorSpace.java PDICCBased.java PDLab.java
Date Wed, 07 May 2014 17:49:38 GMT
Author: lehmi
Date: Wed May  7 17:49:38 2014
New Revision: 1593083

URL: http://svn.apache.org/r1593083
Log:
PDFBOX-2065: removed unnecessary code

Modified:
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDCIEBasedColorSpace.java
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDCalRGB.java
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDColorSpace.java
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDICCBased.java
    pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDLab.java

Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDCIEBasedColorSpace.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDCIEBasedColorSpace.java?rev=1593083&r1=1593082&r2=1593083&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDCIEBasedColorSpace.java
(original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDCIEBasedColorSpace.java
Wed May  7 17:49:38 2014
@@ -74,12 +74,6 @@ public abstract class PDCIEBasedColorSpa
     }
 
     @Override
-    public COSBase getCOSObject()
-    {
-        return array;
-    }
-
-    @Override
     public String toString()
     {
         return getName();   // TODO return more info

Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDCalRGB.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDCalRGB.java?rev=1593083&r1=1593082&r2=1593083&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDCalRGB.java
(original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDCalRGB.java
Wed May  7 17:49:38 2014
@@ -24,8 +24,6 @@ import org.apache.pdfbox.cos.COSName;
 
 import org.apache.pdfbox.pdmodel.common.PDMatrix;
 
-import java.awt.color.ColorSpace;
-
 /**
  * A CalRGB colour space is a CIE-based colour space with one transformation stage instead
of two.
  * In this type of space, A, B, and C represent calibrated red, green, and blue colour values.
@@ -37,7 +35,6 @@ public class PDCalRGB extends PDCIEBased
 {
     private static final PDColor INITIAL_COLOR = new PDColor(new float[] { 0, 0, 0 });
 
-    protected COSArray array;
     protected COSDictionary dictionary;
 
     /**

Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDColorSpace.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDColorSpace.java?rev=1593083&r1=1593082&r2=1593083&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDColorSpace.java
(original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDColorSpace.java
Wed May  7 17:49:38 2014
@@ -18,7 +18,6 @@ package org.apache.pdfbox.pdmodel.graphi
 
 import org.apache.pdfbox.cos.COSBase;
 import org.apache.pdfbox.cos.COSArray;
-
 import org.apache.pdfbox.cos.COSName;
 import org.apache.pdfbox.pdmodel.common.COSObjectable;
 import org.apache.pdfbox.pdmodel.graphics.pattern.PDAbstractPattern;
@@ -30,10 +29,8 @@ import java.awt.Transparency;
 import java.awt.image.BufferedImage;
 import java.awt.image.ColorConvertOp;
 import java.awt.image.ComponentColorModel;
-import java.awt.image.DataBuffer;
 import java.awt.image.WritableRaster;
 import java.io.IOException;
-
 import java.awt.color.ColorSpace;
 import java.awt.image.ColorModel;
 import java.util.Map;
@@ -252,9 +249,10 @@ public abstract class PDColorSpace imple
         return new Color(rgb[0], rgb[1], rgb[2]);
     }
 
-    /**
-     * Converts this standard java object to a COS object.
-     * @return The COS object that matches this Java object.
-     */
-    public abstract COSBase getCOSObject();
+    @Override
+    public COSBase getCOSObject()
+    {
+        return array;
+    }
+
 }

Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDICCBased.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDICCBased.java?rev=1593083&r1=1593082&r2=1593083&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDICCBased.java
(original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDICCBased.java
Wed May  7 17:49:38 2014
@@ -90,12 +90,6 @@ public final class PDICCBased extends PD
         return COSName.ICCBASED.getName();
     }
 
-    @Override
-    public COSBase getCOSObject()
-    {
-        return array;
-    }
-
     /**
      * Get the underlying ICC profile stream.
      * @return the underlying ICC profile stream

Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDLab.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDLab.java?rev=1593083&r1=1593082&r2=1593083&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDLab.java
(original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDLab.java
Wed May  7 17:49:38 2014
@@ -34,7 +34,6 @@ public final class PDLab extends PDCIEBa
 {
     private static final ColorSpace CIEXYZ = ColorSpace.getInstance(ColorSpace.CS_CIEXYZ);
 
-    private COSArray array;
     private COSDictionary dictionary;
     private PDColor initialColor;
     
@@ -79,12 +78,6 @@ public final class PDLab extends PDCIEBa
     }
 
     @Override
-    public COSBase getCOSObject()
-    {
-        return array;
-    }
-
-    @Override
     public float[] toRGB(float[] value)
     {
         float minA = getARange().getMin();



Mime
View raw message