Author: vhennebert
Date: Mon Nov 23 11:46:55 2009
New Revision: 883310
URL: http://svn.apache.org/viewvc?rev=883310&view=rev
Log:
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
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/ICCColorFunction.java
xmlgraphics/fop/trunk/status.xml
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/ICCColorFunction.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/ICCColorFunction.java?rev=883310&r1=883309&r2=883310&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/ICCColorFunction.java
(original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/expr/ICCColorFunction.java
Mon Nov 23 11:46:55 2009
@@ -58,9 +58,11 @@
//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) {
Modified: xmlgraphics/fop/trunk/status.xml
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/status.xml?rev=883310&r1=883309&r2=883310&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/status.xml (original)
+++ xmlgraphics/fop/trunk/status.xml Mon Nov 23 11:46:55 2009
@@ -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.
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
