| Index: src/images/SkImageDecoder.cpp
|
| diff --git a/src/images/SkImageDecoder.cpp b/src/images/SkImageDecoder.cpp
|
| index 38aa7fda0d143a2134d89253c179f46781bb1f30..0aa752e38f937cff246d2bf6415f070b169cd026 100644
|
| --- a/src/images/SkImageDecoder.cpp
|
| +++ b/src/images/SkImageDecoder.cpp
|
| @@ -164,19 +164,12 @@ SkBitmap::Config SkImageDecoder::getPrefConfig(SrcDepth srcDepth,
|
| }
|
|
|
| bool SkImageDecoder::decode(SkStream* stream, SkBitmap* bm,
|
| - SkBitmap::Config pref, Mode mode, bool reuseBitmap) {
|
| + SkBitmap::Config pref, Mode mode) {
|
| // we reset this to false before calling onDecode
|
| fShouldCancelDecode = false;
|
| // assign this, for use by getPrefConfig(), in case fUsePrefTable is false
|
| fDefaultPref = pref;
|
|
|
| - if (reuseBitmap) {
|
| - SkAutoLockPixels alp(*bm);
|
| - if (NULL != bm->getPixels()) {
|
| - return this->onDecode(stream, bm, mode);
|
| - }
|
| - }
|
| -
|
| // pass a temporary bitmap, so that if we return false, we are assured of
|
| // leaving the caller's bitmap untouched.
|
| SkBitmap tmp;
|
|
|