diff options
| author |  msarett <msarett@google.com> | 2015-03-24 12:24:27 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-03-24 12:24:27 -0700 |
| commit | 15bfd075d38e4422a477e22940d06a137f66cc97 (patch) | |
| tree | d3354771b661d48358071fac53b93e258dd9cf71 /dm/DMSrcSink.cpp | |
| parent | 46bffd6fbea7cc17c62cf469db145694cc650665 (diff) | |
Enabling ico decoding with use of png and bmp decoders
BUG=skia:3257
Review URL: https://codereview.chromium.org/1011343003
Diffstat (limited to 'dm/DMSrcSink.cpp')
| -rw-r--r-- | dm/DMSrcSink.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/dm/DMSrcSink.cpp b/dm/DMSrcSink.cpp index 638f670834..fe31d61ef0 100644 --- a/dm/DMSrcSink.cpp +++ b/dm/DMSrcSink.cpp @@ -88,7 +88,11 @@ Error CodecSrc::draw(SkCanvas* canvas) const { SkISize CodecSrc::size() const { SkAutoTUnref<SkData> encoded(SkData::NewFromFileName(fPath.c_str())); SkAutoTDelete<SkCodec> codec(SkCodec::NewFromData(encoded)); - return codec->getInfo().dimensions(); + if (NULL != codec) { + return codec->getInfo().dimensions(); + } else { + return SkISize::Make(0, 0); + } } Name CodecSrc::name() const { |