Ico bug fix for opaque embedded images
authormsarett <msarett@google.com>
Fri, 4 Sep 2015 17:53:53 +0000 (10:53 -0700)
committerCommit bot <commit-bot@chromium.org>
Fri, 4 Sep 2015 17:53:53 +0000 (10:53 -0700)
BUG=skia:

Review URL: https://codereview.chromium.org/1327963004

src/codec/SkCodec_libico.cpp

index ec92937..798169d 100644 (file)
@@ -272,7 +272,7 @@ SkCodec::Result SkIcoCodec::onGetPixels(const SkImageInfo& dstInfo,
                     break;
             }
             SkImageInfo info = dstInfo.makeAlphaType(embeddedAlpha);
-            result = embeddedCodec->getPixels(dstInfo, dst, dstRowBytes, &opts, ct, ptr);
+            result = embeddedCodec->getPixels(info, dst, dstRowBytes, &opts, ct, ptr);
 
             // On a fatal error, keep trying to find an image to decode
             if (kInvalidConversion == result || kInvalidInput == result ||