diff options
| author |  Mike Reed <reed@google.com> | 2017-04-17 11:02:51 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-04-17 15:33:36 +0000 |
| commit | 4edb5d219eb99aa1e8fbe5e37260d3b34314e54b (patch) | |
| tree | 5e9fedc4e0e59db2467a19fe7d4f36030d0d6694 /tools/picture_utils.cpp | |
| parent | 12e946b4bfdf598bffb276776ea6e25439e25265 (diff) | |
hide lockpixels api behind flag
guarded by SK_SUPPORT_OBSOLETE_LOCKPIXELS
needs https://codereview.chromium.org/2820873002/# to land first
Bug: skia:6481
Change-Id: I1c39902cbf6fe99f622adfa8192733b95f7fea09
Change-Id: I1c39902cbf6fe99f622adfa8192733b95f7fea09
Reviewed-on: https://skia-review.googlesource.com/13580
Reviewed-by: Florin Malita <fmalita@chromium.org>
Reviewed-by: Leon Scroggins <scroggo@google.com>
Commit-Queue: Mike Reed <reed@google.com>
Diffstat (limited to 'tools/picture_utils.cpp')
| -rw-r--r-- | tools/picture_utils.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/tools/picture_utils.cpp b/tools/picture_utils.cpp index b0fd224a94..27e91ccdeb 100644 --- a/tools/picture_utils.cpp +++ b/tools/picture_utils.cpp @@ -26,7 +26,6 @@ namespace sk_tools { return; } - SkAutoLockPixels lock(bitmap); for (int y = 0; y < bitmap.height(); y++) { for (int x = 0; x < bitmap.width(); x++) { *bitmap.getAddr32(x, y) |= (SK_A32_MASK << SK_A32_SHIFT); @@ -87,7 +86,6 @@ namespace sk_tools { bitmap.colorSpace() == srgbColorSpace.get()) { // These are premul sRGB 8-bit pixels in SkPMColor order. // We want unpremul sRGB 8-bit pixels in RGBA order. We'll get there via floats. - bitmap.lockPixels(); auto px = (const uint32_t*)bitmap.getPixels(); if (!px) { return nullptr; @@ -105,7 +103,6 @@ namespace sk_tools { } else if (bitmap.colorType() == kRGBA_F16_SkColorType) { // These are premul linear half-float pixels in RGBA order. // We want unpremul sRGB 8-bit pixels in RGBA order. We'll get there via floats. - bitmap.lockPixels(); auto px = (const uint64_t*)bitmap.getPixels(); if (!px) { return nullptr; |