WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp - Issue 5635002: Merge 73112 - 2010-12-02 Adam Barth <abarth@webkit.org>...

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp

Issue 5635002: Merge 73112 - 2010-12-02 Adam Barth <abarth@webkit.org>... (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/597/

Patch Set: Created 10 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

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

===================================================================

--- WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp (revision 73242)

+++ WebCore/platform/image-decoders/jpeg/JPEGImageDecoder.cpp (working copy)

@@ -208,8 +208,13 @@

// Let libjpeg take care of gray->RGB and YCbCr->RGB conversions.

switch (m_info.jpeg_color_space) {

case JCS_GRAYSCALE:

+ case JCS_YCbCr:

+ // Grayscale images get "upsampled" by libjpeg. If we use

+ // their color profile, CoreGraphics will "upsample" them

+ // again, resulting in horizontal distortions.

+ m_decoder->setIgnoreGammaAndColorProfile(true);

+ // Note fall-through!

case JCS_RGB:

- case JCS_YCbCr:

m_info.out_color_space = JCS_RGB;

break;

case JCS_CMYK:

« no previous file with comments | « WebCore/platform/image-decoders/ImageDecoder.h ('k') | no next file » | no next file with comments »