From 4edb5d219eb99aa1e8fbe5e37260d3b34314e54b Mon Sep 17 00:00:00 2001 From: Mike Reed Date: Mon, 17 Apr 2017 11:02:51 -0400 Subject: 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 Reviewed-by: Leon Scroggins Commit-Queue: Mike Reed --- tools/skdiff/skdiff.cpp | 2 -- tools/skdiff/skdiff_utils.cpp | 1 - 2 files changed, 3 deletions(-) (limited to 'tools/skdiff') 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 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); -- cgit v1.2.3