Simplification as suggested by Simon.

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_Color@1069376 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/java/org/apache/fop/afp/goca/GraphicsSetProcessColor.java b/src/java/org/apache/fop/afp/goca/GraphicsSetProcessColor.java
index edde6b95ffce7e5f43bdc1007fe54d522782213e..07d6c78af6cdbc088ef9c76a13c886584dfb5353 100644 (file)
--- a/src/java/org/apache/fop/afp/goca/GraphicsSetProcessColor.java
+++ b/src/java/org/apache/fop/afp/goca/GraphicsSetProcessColor.java
@@ -68,21 +68,19 @@ public class GraphicsSetProcessColor extends AbstractGraphicsDrawingOrder {
         int colSpaceType = cs.getType();
         if (colSpaceType == ColorSpace.TYPE_CMYK) {
             this.color = color;
-            this.componentsSize = 4;
         } else if (cs instanceof CIELabColorSpace) {
             //TODO Convert between illuminants if not D50 according to rendering intents
             //Right now, we're assuming D50 as the GOCA spec requires.
             this.color = color;
             //16bit components didn't work, and 8-bit sadly has reduced accuracy.
-            this.componentsSize = 3;
         } else {
             if (!color.getColorSpace().isCS_sRGB()) {
                 this.color = ColorUtil.toSRGBColor(color);
             } else {
                 this.color = color;
             }
-            this.componentsSize = 3;
         }
+        this.componentsSize = this.color.getColorSpace().getNumComponents();
     }
 
     /** {@inheritDoc} */
@@ -91,6 +89,7 @@ public class GraphicsSetProcessColor extends AbstractGraphicsDrawingOrder {
     }
 
     /** {@inheritDoc} */
+    @Override
     byte getOrderCode() {
         return (byte) 0xB2;
     }
@@ -153,6 +152,7 @@ public class GraphicsSetProcessColor extends AbstractGraphicsDrawingOrder {
     }
 
     /** {@inheritDoc} */
+    @Override
     public String toString() {
         return "GraphicsSetProcessColor(col=" + color + ")";
     }