diff options
| author |  mtklein <mtklein@chromium.org> | 2015-03-06 16:20:22 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-03-06 16:20:22 -0800 |
| commit | a27cdefae19d1d40e6a9ca84935c72bde48236b3 (patch) | |
| tree | 7e2b20a9cb20ec56e0855071310d731527b3c707 /tests/Sk4xTest.cpp | |
| parent | c2ff52920b43304e83d7def592dfacc73b54373e (diff) | |
Make Sk4f(float) constructor explicit.
BUG=skia:
Review URL: https://codereview.chromium.org/985003003
Diffstat (limited to 'tests/Sk4xTest.cpp')
| -rw-r--r-- | tests/Sk4xTest.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/Sk4xTest.cpp b/tests/Sk4xTest.cpp index a7a3184d1e..1cecd4f1fc 100644 --- a/tests/Sk4xTest.cpp +++ b/tests/Sk4xTest.cpp @@ -83,7 +83,7 @@ DEF_TEST(Sk4x_Arith, r) { } DEF_TEST(Sk4x_ImplicitPromotion, r) { - ASSERT_EQ(Sk4f(2,4,6,8), Sk4f(1,2,3,4).multiply(2.0f)); + ASSERT_EQ(Sk4f(2,4,6,8), Sk4f(1,2,3,4).multiply(Sk4f(2.0f))); } DEF_TEST(Sk4x_Sqrt, r) { @@ -91,13 +91,13 @@ DEF_TEST(Sk4x_Sqrt, r) { roots(2, 4, 5, 11); // .sqrt() should be pretty precise. Sk4f error = roots.subtract(squares.sqrt()); - REPORTER_ASSERT(r, error.greaterThanEqual(0.0f).allTrue()); - REPORTER_ASSERT(r, error.lessThan(0.000001f).allTrue()); + REPORTER_ASSERT(r, error.greaterThanEqual(Sk4f(0.0f)).allTrue()); + REPORTER_ASSERT(r, error.lessThan(Sk4f(0.000001f)).allTrue()); // .rsqrt() isn't so precise (for SSE), but should be pretty close. error = roots.subtract(squares.multiply(squares.rsqrt())); - REPORTER_ASSERT(r, error.greaterThanEqual(0.0f).allTrue()); - REPORTER_ASSERT(r, error.lessThan(0.01f).allTrue()); + REPORTER_ASSERT(r, error.greaterThanEqual(Sk4f(0.0f)).allTrue()); + REPORTER_ASSERT(r, error.lessThan(Sk4f(0.01f)).allTrue()); } DEF_TEST(Sk4x_Comparison, r) { |