From 9bde918754bc292469d801f156f3b626eb3db780 Mon Sep 17 00:00:00 2001 From: msarett Date: Wed, 25 Mar 2015 05:27:48 -0700 Subject: Enabling ico decoding with use of png and bmp decoders BUG=skia:3257 NOPRESUBMIT=true Review URL: https://codereview.chromium.org/1011343003 --- dm/DMSrcSink.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'dm/DMSrcSink.cpp') 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 encoded(SkData::NewFromFileName(fPath.c_str())); SkAutoTDelete 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 { -- cgit v1.2.3