| Index: src/images/SkImageDecoder_libjpeg.cpp
|
| diff --git a/src/images/SkImageDecoder_libjpeg.cpp b/src/images/SkImageDecoder_libjpeg.cpp
|
| index 4f78865154fb3e99d7813975717e6504a58ab044..77d1c5feff2fdf038e12f20efe6d8e8a30a22c7e 100644
|
| --- a/src/images/SkImageDecoder_libjpeg.cpp
|
| +++ b/src/images/SkImageDecoder_libjpeg.cpp
|
| @@ -1355,7 +1355,6 @@ protected:
|
|
|
| // allocate these before set call setjmp
|
| SkAutoMalloc oneRow;
|
| - SkAutoLockColors ctLocker;
|
|
|
| cinfo.err = jpeg_std_error(&sk_err);
|
| sk_err.error_exit = skjpeg_error_exit;
|
| @@ -1392,7 +1391,7 @@ protected:
|
| const int width = bm.width();
|
| uint8_t* oneRowP = (uint8_t*)oneRow.reset(width * 3);
|
|
|
| - const SkPMColor* colors = ctLocker.lockColors(bm);
|
| + const SkPMColor* colors = bm.getColorTable() ? bm.getColorTable()->readColors() : NULL;
|
| const void* srcRow = bm.getPixels();
|
|
|
| while (cinfo.next_scanline < cinfo.image_height) {
|
|
|