| Index: src/lazy/SkDiscardablePixelRef.cpp
|
| diff --git a/src/lazy/SkDiscardablePixelRef.cpp b/src/lazy/SkDiscardablePixelRef.cpp
|
| index ce38a4a877b9f2cad2c645b3ec66b9309aba95a6..a86c3deff426a07c548cec81a3325f294e23e6d2 100644
|
| --- a/src/lazy/SkDiscardablePixelRef.cpp
|
| +++ b/src/lazy/SkDiscardablePixelRef.cpp
|
| @@ -105,7 +105,10 @@ bool SkInstallDiscardablePixelRef(SkImageGenerator* generator, SkBitmap* dst,
|
| || (!dst->setInfo(info))) {
|
| return false;
|
| }
|
| - SkASSERT(dst->colorType() != kUnknown_SkColorType);
|
| + // Since dst->setInfo() may have changed/fixed-up info, we copy it back from that bitmap
|
| + info = dst->info();
|
| +
|
| + SkASSERT(info.colorType() != kUnknown_SkColorType);
|
| if (dst->empty()) { // Use a normal pixelref.
|
| return dst->allocPixels();
|
| }
|
|
|