| Index: src/images/SkImageDecoder_libjpeg.cpp
|
| diff --git a/src/images/SkImageDecoder_libjpeg.cpp b/src/images/SkImageDecoder_libjpeg.cpp
|
| index befe6dc580d949adad230f99e07599531229a5e8..9b937162b3e153c33dac0d26423bcd7ad1ae4ce3 100644
|
| --- a/src/images/SkImageDecoder_libjpeg.cpp
|
| +++ b/src/images/SkImageDecoder_libjpeg.cpp
|
| @@ -613,10 +613,12 @@ bool SkJPEGImageDecoder::onDecode(SkStream* stream, SkBitmap* bm, Mode mode) {
|
| }
|
| sampleSize = recompute_sampleSize(sampleSize, cinfo);
|
|
|
| +#ifdef SK_SUPPORT_LEGACY_IMAGEDECODER_CHOOSER
|
| // should we allow the Chooser (if present) to pick a colortype for us???
|
| if (!this->chooseFromOneChoice(colorType, cinfo.output_width, cinfo.output_height)) {
|
| return return_false(cinfo, *bm, "chooseFromOneChoice");
|
| }
|
| +#endif
|
|
|
| SkScaledBitmapSampler sampler(cinfo.output_width, cinfo.output_height, sampleSize);
|
| // Assume an A8 bitmap is not opaque to avoid the check of each
|
|
|