Merge 77724 - 2011-02-04 Hironori Bono <hbono@chromium.org>...

WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp

Index: WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp
===================================================================
--- WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp	(revision 78723)
+++ WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp	(working copy)
@@ -222,6 +222,12 @@
                 // jpeglib cannot convert these to rgb, but it can convert ycck
                 // to cmyk.
                 m_info.out_color_space = JCS_CMYK;
+
+                // Same as with grayscale images, we convert CMYK images to RGBA
+                // ones. When we keep the color profiles of these CMYK images,
+                // CoreGraphics will convert their colors again. So, we discard
+                // their color profiles to prevent color corruption.
+                m_decoder->setIgnoreGammaAndColorProfile(true);
                 break;
             default:
                 return m_decoder->setFailed();