svn commit: r650050 - in /xmlgraphics/fop/trunk: src/java/org/apache/fop/render/pdf/ImageRawJPEGAdapter.java status.xml

[je...@apache.org]

Author: jeremias
Date: Mon Apr 21 01:32:02 2008
New Revision: 650050

URL: http://svn.apache.org/viewvc?rev=650050&view=rev
Log:
Partially reverted my revision 641827: The yellow tint of certain JPEG images came from badly extracted ICC color profiles. This is fixed in XML Graphics Commons Trunk (revision 650048).

Modified:
    xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/ImageRawJPEGAdapter.java
    xmlgraphics/fop/trunk/status.xml

Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/ImageRawJPEGAdapter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/ImageRawJPEGAdapter.java?rev=650050&r1=650049&r2=650050&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/ImageRawJPEGAdapter.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/render/pdf/ImageRawJPEGAdapter.java Mon Apr 21 01:32:02 2008
@@ -18,7 +18,6 @@
 /* $Id$ */
 
 package org.apache.fop.render.pdf;
-import java.awt.color.ICC_Profile;
 import java.io.DataInput;
 import java.io.IOException;
 import java.io.InputStream;
@@ -36,7 +35,6 @@
 import org.apache.fop.pdf.PDFDocument;
 import org.apache.fop.pdf.PDFFilter;
 import org.apache.fop.pdf.PDFFilterList;
-import org.apache.fop.util.ColorProfileUtil;
 
 /**
  * PDFImage implementation for the PDF renderer which handles raw JPEG images.
@@ -81,21 +79,6 @@
         return toPDFColorSpace(getImageColorSpace());
     }
 
-    /** {@inheritDoc} */
-    protected ICC_Profile getEffectiveICCProfile() {
-        ICC_Profile profile = super.getEffectiveICCProfile();
-        if (profile != null 
-                && profile.getNumComponents() == 3
-                && !ColorProfileUtil.isDefaultsRGB(profile)) {
-            //RGB profiles which are not sRGB don't seem to work.
-            //Without this override, the image drifts into yellow for an unknown reason.
-            //TODO Find out why this happens.
-            //Test using a JPEG images with, for example, "Adobe RGB 1998" color profile.
-            profile = null;
-        }
-        return profile;
-    }
-    
     /** {@inheritDoc} */
     public int getBitsPerComponent() {
         return 8;

Modified: xmlgraphics/fop/trunk/status.xml
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/status.xml?rev=650050&r1=650049&r2=650050&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/status.xml (original)
+++ xmlgraphics/fop/trunk/status.xml Mon Apr 21 01:32:02 2008
@@ -81,11 +81,6 @@
         When a JPEG image is embedded, an optionally embedded color profile is filtered out
         as it's already embedded separately in the PDF file.
       </action>
-      <action context="Renderers" dev="JM" type="fix">
-        Worked around a problem (PDF renderer) with JPEG image containing RGB color profiles which
-        are not sRGB. The images drifted into yellow. The color profile is simply disabled in this
-        case. Please let us know if you know what the problem could be.
-      </action>
       <action context="Fonts" dev="JM" type="add">
         Added support for addressing all glyphs available in a Type 1 font, not just the ones
         in the font's primary encoding.



---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org