From 0a097ea91cbbda7d1bb408818a772c5c783cc807 Mon Sep 17 00:00:00 2001 From: "commit-bot@chromium.org" Date: Thu, 20 Feb 2014 21:04:40 +0000 Subject: Fix bug in deferred decoding where we don't properly pass the unpremul option to the codec. R=reed@google.com, scroggo@google.com Author: djsollen@google.com Review URL: https://codereview.chromium.org/172873003 git-svn-id: http://skia.googlecode.com/svn/trunk@13521 2bbb7eff-a529-9590-31e7-b0007b416f81 --- src/images/SkImageRef.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/images/SkImageRef.cpp') diff --git a/src/images/SkImageRef.cpp b/src/images/SkImageRef.cpp index f3cc9e5590..458aa2aa5a 100644 --- a/src/images/SkImageRef.cpp +++ b/src/images/SkImageRef.cpp @@ -121,13 +121,12 @@ bool SkImageRef::prepareBitmap(SkImageDecoder::Mode mode) { codec->setSampleSize(fSampleSize); codec->setDitherImage(fDoDither); + codec->setRequireUnpremultipliedColors(this->info().fAlphaType == kUnpremul_SkAlphaType); if (this->onDecode(codec, fStream, &fBitmap, fBitmap.config(), mode)) { if (kOpaque_SkAlphaType == fBitmap.alphaType()) { this->changeAlphaType(kOpaque_SkAlphaType); } - SkASSERT(this->info().fColorType == fBitmap.colorType()); - SkASSERT(this->info().fWidth == fBitmap.width()); - SkASSERT(this->info().fHeight == fBitmap.height()); + SkASSERT(this->info() == fBitmap.info()); return true; } } -- cgit v1.2.3