diff options
author | mtklein <mtklein@chromium.org> | 2014-12-02 09:11:25 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2014-12-02 09:11:25 -0800 |
commit | 775b8199a214af57c3ea7969e9d456f5f3eb137f (patch) | |
tree | b4729e4aea47f46a371957cf713a4cc135717a3d /src/images/SkImageEncoder_argb.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/SkImageEncoder_argb.cpp')
-rw-r--r-- | src/images/SkImageEncoder_argb.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/images/SkImageEncoder_argb.cpp b/src/images/SkImageEncoder_argb.cpp index 296491eef8..02d5490452 100644 --- a/src/images/SkImageEncoder_argb.cpp +++ b/src/images/SkImageEncoder_argb.cpp @@ -98,8 +98,7 @@ bool SkARGBImageEncoder::onEncode(SkWStream* stream, const SkBitmap& bitmap, int return false; } - SkAutoLockColors ctLocker; - const SkPMColor* colors = ctLocker.lockColors(bitmap); + const SkPMColor* colors = bitmap.getColorTable() ? bitmap.getColorTable()->readColors() : NULL; const int argbStride = bitmap.width() * 4; SkAutoTDeleteArray<uint8_t> ada(new uint8_t[argbStride]); |