Bugzilla #48167: when #CMYK pseudo-profile was used in the rgb-icc() function, always the fallback RGB colors were used instead.

Patch submitted by Venkat Reddy


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

src/java/org/apache/fop/fo/expr/ICCColorFunction.java

@@ -58,9 +58,11 @@ class ICCColorFunction extends FunctionBase {
             //a) before the fo:declarations,
             //b) or in a document without fo:declarations?
             //=> return the sRGB fallback
-            Property[] rgbArgs = new Property[3];
-            System.arraycopy(args, 0, rgbArgs, 0, 3);
-            return new RGBColorFunction().eval(rgbArgs, pInfo);
+            if (!ColorUtil.isPseudoProfile(colorProfileName)) {
+                Property[] rgbArgs = new Property[3];
+                System.arraycopy(args, 0, rgbArgs, 0, 3);
+                return new RGBColorFunction().eval(rgbArgs, pInfo);
+            }
         } else {
             cp = decls.getColorProfile(colorProfileName);
             if (cp == null) {

status.xml

@@ -58,6 +58,10 @@
       documents. Example: the fix of marks layering will be such a case when it's done.
     -->
     <release version="FOP Trunk" date="TBD">
+      <action context="Code" dev="VH" type="fix" fixes-bug="48167" due-to="Venkat Reddy">
+        Bugfix: when #CMYK pseudo-profile was used in the rgb-icc() function, always the fallback 
+        RGB colors were used instead.
+      </action>
       <action context="Layout" dev="VH" type="fix" fixes-bug="48082">
         Bugfix: value of conditional space not always taken into account in the calculation of a 
         table’s height.