dm/DMSrcSink.cpp - Issue 1022843005: Revert of Enabling ico decoding with use of png and bmp decoders

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: dm/DMSrcSink.cpp

Issue 1022843005: Revert of Enabling ico decoding with use of png and bmp decoders (Closed) Base URL: https://skia.googlesource.com/skia.git@swizzle

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

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

Download patch

Index: dm/DMSrcSink.cpp

diff --git a/dm/DMSrcSink.cpp b/dm/DMSrcSink.cpp

index fe31d61ef0182a590d959667f695f1bae309ea89..638f6708343ec6c8b24dcb5d35cde124cbfc5452 100644

--- a/dm/DMSrcSink.cpp

+++ b/dm/DMSrcSink.cpp

@@ -88,11 +88,7 @@

SkISize CodecSrc::size() const {

SkAutoTUnref<SkData> encoded(SkData::NewFromFileName(fPath.c_str()));

SkAutoTDelete<SkCodec> codec(SkCodec::NewFromData(encoded));

- if (NULL != codec) {

- return codec->getInfo().dimensions();

- } else {

- return SkISize::Make(0, 0);

- }

+ return codec->getInfo().dimensions();

}

Name CodecSrc::name() const {

« no previous file with comments | « dm/DM.cpp ('k') | gyp/codec.gyp » ('j') | no next file with comments »