| Index: src/lazy/SkLazyPixelRef.cpp
|
| diff --git a/src/lazy/SkLazyPixelRef.cpp b/src/lazy/SkLazyPixelRef.cpp
|
| index 9e023c4a7c8859369886fe07a650c85fe1c69e23..22d4b112f18688dcedcef287dac019bc7c5f9210 100644
|
| --- a/src/lazy/SkLazyPixelRef.cpp
|
| +++ b/src/lazy/SkLazyPixelRef.cpp
|
| @@ -150,15 +150,14 @@ SkData* SkLazyPixelRef::onRefEncodedData() {
|
|
|
| static bool init_from_info(SkBitmap* bm, const SkImage::Info& info,
|
| size_t rowBytes) {
|
| - bool isOpaque;
|
| - SkBitmap::Config config = SkImageInfoToBitmapConfig(info, &isOpaque);
|
| + SkBitmap::Config config = SkImageInfoToBitmapConfig(info);
|
| if (SkBitmap::kNo_Config == config) {
|
| return false;
|
| }
|
|
|
| - bm->setConfig(config, info.fWidth, info.fHeight, rowBytes);
|
| - bm->setIsOpaque(isOpaque);
|
| - return bm->allocPixels();
|
| + return bm->setConfig(config, info.fWidth, info.fHeight, rowBytes, info.fAlphaType)
|
| + &&
|
| + bm->allocPixels();
|
| }
|
|
|
| bool SkLazyPixelRef::onImplementsDecodeInto() {
|
|
|