| Index: src/images/SkImageDecoder_pkm.cpp
|
| diff --git a/src/images/SkImageDecoder_pkm.cpp b/src/images/SkImageDecoder_pkm.cpp
|
| index c299c23548d603c4c57e6a0e30ca884fc3bd9ff7..79da8da51a1d80a059cf17aa0bcdb491c7ceba23 100644
|
| --- a/src/images/SkImageDecoder_pkm.cpp
|
| +++ b/src/images/SkImageDecoder_pkm.cpp
|
| @@ -47,7 +47,7 @@ bool SkPKMImageDecoder::onDecode(SkStream* stream, SkBitmap* bm, Mode mode) {
|
| const unsigned short height = etc1_pkm_get_height(buf);
|
|
|
| // should we allow the Chooser (if present) to pick a config for us???
|
| - if (!this->chooseFromOneChoice(SkBitmap::kARGB_8888_Config, width, height)) {
|
| + if (!this->chooseFromOneChoice(kN32_SkColorType, width, height)) {
|
| return false;
|
| }
|
|
|
| @@ -55,8 +55,8 @@ bool SkPKMImageDecoder::onDecode(SkStream* stream, SkBitmap* bm, Mode mode) {
|
| SkScaledBitmapSampler sampler(width, height, this->getSampleSize());
|
|
|
| // Set the config...
|
| - bm->setConfig(SkBitmap::kARGB_8888_Config, sampler.scaledWidth(), sampler.scaledHeight(),
|
| - 0, kOpaque_SkAlphaType);
|
| + bm->setInfo(SkImageInfo::MakeN32(sampler.scaledWidth(), sampler.scaledHeight(),
|
| + kOpaque_SkAlphaType));
|
| if (SkImageDecoder::kDecodeBounds_Mode == mode) {
|
| return true;
|
| }
|
|
|