Bugfix: use the effective color profile supplied by the ImageEncodingHelper, instead of the original one.

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

1 files changed, 13 insertions, 1 deletions

diff --git a/src/java/org/apache/fop/render/pdf/ImageRenderedAdapter.java b/src/java/org/apache/fop/render/pdf/ImageRenderedAdapter.java
index 5ddcd06c6..27d25e15b 100644
--- a/src/java/org/apache/fop/render/pdf/ImageRenderedAdapter.java
+++ b/src/java/org/apache/fop/render/pdf/ImageRenderedAdapter.java
@@ -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 @@ public class ImageRenderedAdapter extends AbstractImageAdapter {
     }
 
     /** {@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);