diff options
| author |  skia.committer@gmail.com <skia.committer@gmail.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-07-25 07:01:00 +0000 |
|---|---|---|
| committer | skia.committer@gmail.com <skia.committer@gmail.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-07-25 07:01:00 +0000 |
| commit | 5c561cb8d8151d38c69128345106cbf225033a1a (patch) | |
| tree | 5c58967605a279535305a3c3c4b63dd1179139dd /tests/MatrixTest.cpp | |
| parent | b1135a3ecd1a7c18f2421bb08dac3487bd29c4e3 (diff) | |
Sanitizing source files in Housekeeper-Nightly
git-svn-id: http://skia.googlecode.com/svn/trunk@10340 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'tests/MatrixTest.cpp')
| -rw-r--r-- | tests/MatrixTest.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/MatrixTest.cpp b/tests/MatrixTest.cpp index 0ca0296fcc..2f16d65661 100644 --- a/tests/MatrixTest.cpp +++ b/tests/MatrixTest.cpp @@ -347,7 +347,7 @@ static void test_matrix_is_similarity(skiatest::Reporter* reporter) { } // For test_matrix_decomposition, below. -static bool scalar_nearly_equal_relative(SkScalar a, SkScalar b, +static bool scalar_nearly_equal_relative(SkScalar a, SkScalar b, SkScalar tolerance = SK_ScalarNearlyZero) { // from Bruce Dawson SkScalar diff = SkScalarAbs(a - b); @@ -515,11 +515,11 @@ static void test_matrix_decomposition(skiatest::Reporter* reporter) { SkScalar s1 = SkScalarSinCos(rotation1, &c1); REPORTER_ASSERT(reporter, scalar_nearly_equal_relative(mat[SkMatrix::kMScaleX], scaleX*c0*c1 - scaleY*s0*s1)); - REPORTER_ASSERT(reporter, scalar_nearly_equal_relative(mat[SkMatrix::kMSkewX], + REPORTER_ASSERT(reporter, scalar_nearly_equal_relative(mat[SkMatrix::kMSkewX], -scaleX*s0*c1 - scaleY*c0*s1)); - REPORTER_ASSERT(reporter, scalar_nearly_equal_relative(mat[SkMatrix::kMSkewY], + REPORTER_ASSERT(reporter, scalar_nearly_equal_relative(mat[SkMatrix::kMSkewY], scaleX*c0*s1 + scaleY*s0*c1)); - REPORTER_ASSERT(reporter, scalar_nearly_equal_relative(mat[SkMatrix::kMScaleY], + REPORTER_ASSERT(reporter, scalar_nearly_equal_relative(mat[SkMatrix::kMScaleY], -scaleX*s0*s1 + scaleY*c0*c1)); } else { // if the matrix is degenerate, the basis vectors should be near-parallel or near-zero |