diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/ImageFilterTest.cpp | 2 | ||||
| -rw-r--r-- | tests/MatrixTest.cpp | 8 | ||||
| -rw-r--r-- | tests/PaintTest.cpp | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/tests/ImageFilterTest.cpp b/tests/ImageFilterTest.cpp index 6331020965..da1a719675 100644 --- a/tests/ImageFilterTest.cpp +++ b/tests/ImageFilterTest.cpp @@ -48,7 +48,7 @@ public: SkAutoTUnref<SkImageFilter> quarterBrightness(make_scale(0.5f, halfBrightness)); REPORTER_ASSERT(reporter, NULL == quarterBrightness->getInput(0)); } - + { // Check that a clipping color matrix followed by a grayscale does not concatenate into a single filter. SkAutoTUnref<SkImageFilter> doubleBrightness(make_scale(2.0f)); 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 diff --git a/tests/PaintTest.cpp b/tests/PaintTest.cpp index dc131f20e2..e25c7c3f08 100644 --- a/tests/PaintTest.cpp +++ b/tests/PaintTest.cpp @@ -111,10 +111,10 @@ static void test_cmap(skiatest::Reporter* reporter) { // temparary api for bicubic, just be sure we can set/clear it static void test_filterlevel(skiatest::Reporter* reporter) { SkPaint p0, p1; - + REPORTER_ASSERT(reporter, SkPaint::kNone_FilterLevel == p0.getFilterLevel()); - + static const SkPaint::FilterLevel gLevels[] = { SkPaint::kNone_FilterLevel, SkPaint::kLow_FilterLevel, |