By using the getRGB() method we convert all PNG images to sRGB regardless of their original color spaces. So we should also always return the sRGB color space. Otherwise, grayscale PNGs, for example, will not be displayed correctly.

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

1 files changed, 4 insertions, 1 deletions

diff --git a/src/java-1.4/org/apache/fop/image/ImageIOImage.java b/src/java-1.4/org/apache/fop/image/ImageIOImage.java
index db9262adc..463331530 100644
--- a/src/java-1.4/org/apache/fop/image/ImageIOImage.java
+++ b/src/java-1.4/org/apache/fop/image/ImageIOImage.java
@@ -21,6 +21,7 @@ package org.apache.fop.image;
 
 // AWT
 import java.awt.Color;
+import java.awt.color.ColorSpace;
 import java.awt.image.ColorModel;
 import java.awt.image.IndexColorModel;
 import java.awt.image.BufferedImage;
@@ -121,7 +122,9 @@ public class ImageIOImage extends AbstractFopImage {
 
             ColorModel cm = imageData.getColorModel();
             this.bitsPerPixel = cm.getComponentSize(0); //only use first, we assume all are equal
-            this.colorSpace = cm.getColorSpace();
+            //this.colorSpace = cm.getColorSpace();
+            //We currently force the image to sRGB
+            this.colorSpace = ColorSpace.getInstance(ColorSpace.CS_sRGB);
 
             int[] tmpMap = imageData.getRGB(0, 0, this.width,
                                             this.height, null, 0, this.width);