Author: vhennebert
Date: Fri May 8 11:21:41 2009
New Revision: 772943
URL: http://svn.apache.org/viewvc?rev=772943&view=rev
Log:
Bugfix: use the effective color profile supplied by the ImageEncodingHelper,
instead of the original one.
Modified:
xmlgraphics/fop/trunk/lib/xmlgraphics-commons-1.4svn.jar
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/ImageRenderedAdapter.java
xmlgraphics/fop/trunk/status.xml
Modified: xmlgraphics/fop/trunk/lib/xmlgraphics-commons-1.4svn.jar
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/lib/xmlgraphics-commons-1.4svn.jar?rev=772943&r1=772942&r2=772943&view=diff
==============================================================================
Binary files - no diff available.
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/ImageRenderedAdapter.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/ImageRenderedAdapter.java?rev=772943&r1=772942&r2=772943&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/ImageRenderedAdapter.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/ImageRenderedAdapter.java
Fri May 8 11:21:41 2009
@@ -19,6 +19,8 @@
package org.apache.fop.render.pdf;
import java.awt.color.ColorSpace;
+import java.awt.color.ICC_ColorSpace;
+import java.awt.color.ICC_Profile;
import java.awt.image.ColorModel;
import java.awt.image.IndexColorModel;
import java.awt.image.RenderedImage;
@@ -97,9 +99,19 @@
}
/** {...@inheritdoc} */
+ protected ICC_Profile getEffectiveICCProfile() {
+ ColorSpace cs = getImageColorSpace();
+ if (cs instanceof ICC_ColorSpace) {
+ ICC_ColorSpace iccSpace = (ICC_ColorSpace)cs;
+ return iccSpace.getProfile();
+ } else {
+ return null;
+ }
+ }
+
+ /** {...@inheritdoc} */
public void setup(PDFDocument doc) {
RenderedImage ri = getImage().getRenderedImage();
- ColorModel cm = getEffectiveColorModel();
super.setup(doc);
Modified: xmlgraphics/fop/trunk/status.xml
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/status.xml?rev=772943&r1=772942&r2=772943&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/status.xml (original)
+++ xmlgraphics/fop/trunk/status.xml Fri May 8 11:21:41 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="Images" dev="JM" type="fix">
+ Bugfix: use the effective color profile supplied by the
ImageEncodingHelper, instead of the
+ original one.
+ </action>
<action context="Renderers" dev="JM" type="fix">
Bugfix: reset graphic state when a page is finished in PostScript.
</action>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
