diff options
author | Ben Murdoch <benm@google.com> | 2011-03-01 02:08:54 -0800 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-03-01 02:08:54 -0800 |
commit | 5439bf98d1367aded4610144d1606856e042ca09 (patch) | |
tree | ae4335ee9c52b038fb5eb756df6676baa60262a1 /WebCore/platform | |
parent | e79cc5764842b01be575505db07ae700184f09ec (diff) | |
parent | eae5ec3fe468b5bbad56eb04b00d7ad34ebcc480 (diff) | |
download | external_webkit-5439bf98d1367aded4610144d1606856e042ca09.zip external_webkit-5439bf98d1367aded4610144d1606856e042ca09.tar.gz external_webkit-5439bf98d1367aded4610144d1606856e042ca09.tar.bz2 |
Merge changes I7d73cc44,I610ebdbc
* changes:
Merge WebKit at Chromium 9.0.597.107: Update WebKit merge revision
Merge WebKit at Chromium 9.0.597.107: Initial merge by git.
Diffstat (limited to 'WebCore/platform')
-rw-r--r-- | WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp b/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp index a2b9f8e..855ba24 100644 --- a/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp +++ b/WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp @@ -222,6 +222,12 @@ public: // 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(); |