src/codec/SkBmpStandardCodec.cpp - Issue 1820283002: Refactor SkBmpCodec

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: src/codec/SkBmpStandardCodec.cpp

Issue 1820283002: Refactor SkBmpCodec (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: Created 4 years, 9 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:

Index: src/codec/SkBmpStandardCodec.cpp

diff --git a/src/codec/SkBmpStandardCodec.cpp b/src/codec/SkBmpStandardCodec.cpp

index 39d357be8b0089c87a7f36b9f2027c1c9770a0c0..80a989ae4d6ea4b2be98a1147a76ace2214d1c76 100644

--- a/src/codec/SkBmpStandardCodec.cpp

+++ b/src/codec/SkBmpStandardCodec.cpp

@@ -228,7 +228,7 @@ int SkBmpStandardCodec::decodeRows(const SkImageInfo& dstInfo, void* dst, size_t

fSwizzler->swizzle(dstRow, fSrcBuffer.get());

}

- if (fInIco) {

+ if (fInIco && fIsOpaque) {

msarett 2016/03/22 13:49:04 There shouldn't be a transparency mask if the BMP

const int startScanline = this->currScanline();

if (startScanline < 0) {

// We are not performing a scanline decode.

« no previous file with comments | « src/codec/SkBmpCodec.cpp ('k') | no next file » | no next file with comments »