diff options
| author |  tomhudson <tomhudson@google.com> | 2015-03-24 13:47:41 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-03-24 13:47:41 -0700 |
| commit | 7aa846c6837f527067e7ab5fdeacdbd502696382 (patch) | |
| tree | 79119d6e358754fe32dbb4a025a4f0273ba2719c /dm/DMSrcSink.cpp | |
| parent | 48dc6dc52ecfcc1e0cfd75f637d55c03e4d6bcb2 (diff) | |
Revert of Enabling ico decoding with use of png and bmp decoders (patchset #10 id:280001 of https://codereview.chromium.org/1011343003/)
Reason for revert:
Reverting on suspicion of massive bot failures - possible command line too long?
Original issue's description:
> Enabling ico decoding with use of png and bmp decoders
>
> BUG=skia:3257
>
> Committed: https://skia.googlesource.com/skia/+/15bfd075d38e4422a477e22940d06a137f66cc97
TBR=scroggo@google.com,reed@google.com,djsollen@google.com,msarett@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:3257
Review URL: https://codereview.chromium.org/1022843005
Diffstat (limited to 'dm/DMSrcSink.cpp')
| -rw-r--r-- | dm/DMSrcSink.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/dm/DMSrcSink.cpp b/dm/DMSrcSink.cpp index fe31d61ef0..638f670834 100644 --- a/dm/DMSrcSink.cpp +++ b/dm/DMSrcSink.cpp @@ -88,11 +88,7 @@ Error CodecSrc::draw(SkCanvas* canvas) const { 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 { |