Commit b27b1931 authored by enne@chromium.org's avatar enne@chromium.org

cc: Fix bogus SkColorSetA usage

SkColorSetA returns the modified value and doesn't change it in place.

R=danakj@chromium.org
BUG=none

Review URL: https://chromiumcodereview.appspot.com/16295025

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@204061 0039d316-1c4b-4281-b951-d872f2087c98
parent f09cc4a9
...@@ -31,8 +31,8 @@ bool ExactPixelComparator::Compare(const SkBitmap& actual_bmp, ...@@ -31,8 +31,8 @@ bool ExactPixelComparator::Compare(const SkBitmap& actual_bmp,
SkColor actual_color = actual_bmp.getColor(x, y); SkColor actual_color = actual_bmp.getColor(x, y);
SkColor expected_color = expected_bmp.getColor(x, y); SkColor expected_color = expected_bmp.getColor(x, y);
if (discard_alpha_) { if (discard_alpha_) {
SkColorSetA(actual_color, 0); actual_color = SkColorSetA(actual_color, 0);
SkColorSetA(expected_color, 0); expected_color = SkColorSetA(expected_color, 0);
} }
if (actual_color != expected_color) { if (actual_color != expected_color) {
...@@ -107,8 +107,8 @@ bool FuzzyPixelComparator::Compare(const SkBitmap& actual_bmp, ...@@ -107,8 +107,8 @@ bool FuzzyPixelComparator::Compare(const SkBitmap& actual_bmp,
SkColor actual_color = actual_bmp.getColor(x, y); SkColor actual_color = actual_bmp.getColor(x, y);
SkColor expected_color = expected_bmp.getColor(x, y); SkColor expected_color = expected_bmp.getColor(x, y);
if (discard_alpha_) { if (discard_alpha_) {
SkColorSetA(actual_color, 0); actual_color = SkColorSetA(actual_color, 0);
SkColorSetA(expected_color, 0); expected_color = SkColorSetA(expected_color, 0);
} }
if (actual_color != expected_color) { if (actual_color != expected_color) {
...@@ -198,8 +198,8 @@ bool FuzzyPixelComparator::Compare(const SkBitmap& actual_bmp, ...@@ -198,8 +198,8 @@ bool FuzzyPixelComparator::Compare(const SkBitmap& actual_bmp,
SkColor actual_color = actual_bmp.getColor(x, y); SkColor actual_color = actual_bmp.getColor(x, y);
SkColor expected_color = expected_bmp.getColor(x, y); SkColor expected_color = expected_bmp.getColor(x, y);
if (discard_alpha_) { if (discard_alpha_) {
SkColorSetA(actual_color, 0); actual_color = SkColorSetA(actual_color, 0);
SkColorSetA(expected_color, 0); expected_color = SkColorSetA(expected_color, 0);
} }
if (actual_color != expected_color) { if (actual_color != expected_color) {
LOG(ERROR) << "Pixel error at x=" << x << " y=" << y << "; " LOG(ERROR) << "Pixel error at x=" << x << " y=" << y << "; "
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment