src/codec/SkCodec.cpp - Issue 1254483004: Scanline decoding for wbmp

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/SkCodec.cpp

Issue 1254483004: Scanline decoding for wbmp (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: More minor fixes Created 5 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:

Index: src/codec/SkCodec.cpp

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

index 6ef61b289a4765440a4456ca4950be905d3b6cb0..ffe90af5399004b3dcde1155ec1a8309890c7ede 100644

--- a/src/codec/SkCodec.cpp

+++ b/src/codec/SkCodec.cpp

@@ -133,10 +133,5 @@ SkCodec::Result SkCodec::getPixels(const SkImageInfo& info, void* pixels, size_t

}

SkCodec::Result SkCodec::getPixels(const SkImageInfo& info, void* pixels, size_t rowBytes) {

- SkASSERT(kIndex_8_SkColorType != info.colorType());

- if (kIndex_8_SkColorType == info.colorType()) {

- return kInvalidConversion;

- }

return this->getPixels(info, pixels, rowBytes, NULL, NULL, NULL);

}