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/skdiff | |
| 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/skdiff')
| -rw-r--r-- | tools/skdiff/skdiff.cpp | 2 | ||||
| -rw-r--r-- | tools/skdiff/skdiff_utils.cpp | 1 |
2 files changed, 0 insertions, 3 deletions
diff --git a/tools/skdiff/skdiff.cpp b/tools/skdiff/skdiff.cpp index ae6d72cd7a..c7ddf7dca5 100644 --- a/tools/skdiff/skdiff.cpp +++ b/tools/skdiff/skdiff.cpp @@ -163,8 +163,6 @@ void compute_diff(DiffRecord* dr, DiffMetricProc diffFunction, const int colorTh return; } - SkAutoLockPixels alpDiff(dr->fDifference.fBitmap); - SkAutoLockPixels alpWhite(dr->fWhite.fBitmap); int mismatchedPixels = 0; int totalMismatchA = 0; int totalMismatchR = 0; diff --git a/tools/skdiff/skdiff_utils.cpp b/tools/skdiff/skdiff_utils.cpp index f8eed908b7..05e1c50388 100644 --- a/tools/skdiff/skdiff_utils.cpp +++ b/tools/skdiff/skdiff_utils.cpp @@ -71,7 +71,6 @@ bool get_bitmap(sk_sp<SkData> fileBits, DiffResource& resource, bool sizeOnly) { /** Thanks to PNG, we need to force all pixels 100% opaque. */ static void force_all_opaque(const SkBitmap& bitmap) { - 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); |