From c161b98d6d5e129705cd51e28ac912508771076e Mon Sep 17 00:00:00 2001 From: Vincent Hennebert Date: Mon, 23 Nov 2009 11:46:55 +0000 Subject: [PATCH] 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 | 8 +++++--- status.xml | 4 ++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/java/org/apache/fop/fo/expr/ICCColorFunction.java b/src/java/org/apache/fop/fo/expr/ICCColorFunction.java index 9e2ef2e7d..1235f4c4f 100644 --- a/src/java/org/apache/fop/fo/expr/ICCColorFunction.java +++ b/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) { diff --git a/status.xml b/status.xml index f3f22de2e..9ca9b0c01 100644 --- a/status.xml +++ b/status.xml @@ -58,6 +58,10 @@ documents. Example: the fix of marks layering will be such a case when it's done. --> + + Bugfix: when #CMYK pseudo-profile was used in the rgb-icc() function, always the fallback + RGB colors were used instead. + Bugfix: value of conditional space not always taken into account in the calculation of a table’s height. -- 2.39.5