third_party/WebKit/Source/platform/image-decoders/bmp/BMPImageReader.cpp - Issue 2203903002: Color: Read embedded ICC profiles regardless of QCMS

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: third_party/WebKit/Source/platform/image-decoders/bmp/BMPImageReader.cpp

Issue 2203903002: Color: Read embedded ICC profiles regardless of QCMS (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Update tests Created 4 years, 4 months 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

« third_party/WebKit/Source/platform/graphics/BitmapImageTest.cpp ('K') | « third_party/WebKit/Source/platform/image-decoders/ImageFrame.cpp ('k') | third_party/WebKit/Source/platform/image-decoders/gif/GIFImageDecoder.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/platform/image-decoders/bmp/BMPImageReader.cpp

diff --git a/third_party/WebKit/Source/platform/image-decoders/bmp/BMPImageReader.cpp b/third_party/WebKit/Source/platform/image-decoders/bmp/BMPImageReader.cpp

index 3f481173787917ab68616a545a1a43b631e4d124..0ee27a6cd0630716f58445f3d3dfc4242a98b676 100644

--- a/third_party/WebKit/Source/platform/image-decoders/bmp/BMPImageReader.cpp

+++ b/third_party/WebKit/Source/platform/image-decoders/bmp/BMPImageReader.cpp

@@ -119,7 +119,7 @@ bool BMPImageReader::decodeBMP(bool onlySize)

// Initialize the framebuffer if needed.

ASSERT(m_buffer); // Parent should set this before asking us to decode!

if (m_buffer->getStatus() == ImageFrame::FrameEmpty) {

- if (!m_buffer->setSize(m_parent->size().width(), m_parent->size().height()))

+ if (!m_buffer->setSizeAndColorProfile(m_parent->size().width(), m_parent->size().height(), ImageFrame::ICCProfile()))

return m_parent->setFailed(); // Unable to allocate.

m_buffer->setStatus(ImageFrame::FramePartial);

// setSize() calls eraseARGB(), which resets the alpha flag, so we force