diff options
author | 2014-12-02 09:11:25 -0800 | |
---|---|---|
committer | 2014-12-02 09:11:25 -0800 | |
commit | 775b8199a214af57c3ea7969e9d456f5f3eb137f (patch) | |
tree | b4729e4aea47f46a371957cf713a4cc135717a3d /src/images/SkImageDecoder_libjpeg.cpp | |
parent | ba1bf8af8d63ce866e3099c410228ba814491957 (diff) |
SkColorTable locking serves no purpose anymore.
The only thing the unlock methods were doing was assert their balance.
This removes the unlock methods and renames the lock methods "read".
BUG=skia:
Review URL: https://codereview.chromium.org/719213008
Diffstat (limited to 'src/images/SkImageDecoder_libjpeg.cpp')
-rw-r--r-- | src/images/SkImageDecoder_libjpeg.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/images/SkImageDecoder_libjpeg.cpp b/src/images/SkImageDecoder_libjpeg.cpp index 4f78865154..77d1c5feff 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) { |