aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/java/org/apache/fop/fo/expr/ICCColorFunction.java8
-rw-r--r--status.xml4
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.
-->
<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.