diff options
author | 2014-06-09 19:52:07 -0700 | |
---|---|---|
committer | 2014-06-09 19:52:07 -0700 | |
commit | 6c22573edb234ad14df947278cfed010669a39a7 (patch) | |
tree | ede271bf82d823809c12d9b4ef3801dc7d6ddd73 /src/images/SkImageDecoder_pkm.cpp | |
parent | 7c5c9da436194c75d91797f114a87a6119ca255d (diff) |
hide SkBitmap::setConfig
patch from issue 325733002
TBR=scroggo
Author: reed@chromium.org
Review URL: https://codereview.chromium.org/322963002
Diffstat (limited to 'src/images/SkImageDecoder_pkm.cpp')
-rw-r--r-- | src/images/SkImageDecoder_pkm.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/images/SkImageDecoder_pkm.cpp b/src/images/SkImageDecoder_pkm.cpp index c299c23548..79da8da51a 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; } |