diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-11-25 19:44:07 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-11-25 19:44:07 +0000 |
| commit | 4b413c8bb123e42ca4b9c7bfa6bc2167283cb84c (patch) | |
| tree | dae12c217068df2844c0ce18fb2c62311ae8c5e9 /tests/PointTest.cpp | |
| parent | 2a1f4464d150d2dc8c3fe2f39e9fb3503b7f4f54 (diff) | |
remove SkFloatToScalar macro
BUG=
R=reed@google.com, djsollen@google.com
Author: caryclark@google.com
Review URL: https://codereview.chromium.org/85463005
git-svn-id: http://skia.googlecode.com/svn/trunk@12385 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'tests/PointTest.cpp')
| -rw-r--r-- | tests/PointTest.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/PointTest.cpp b/tests/PointTest.cpp index 9f91c47c1c..d4b9128b3e 100644 --- a/tests/PointTest.cpp +++ b/tests/PointTest.cpp @@ -84,7 +84,7 @@ static float force_as_float(skiatest::Reporter* reporter, float value) { // test that we handle very large values correctly. i.e. that we can // successfully normalize something whose mag overflows a float. static void test_overflow(skiatest::Reporter* reporter) { - SkScalar bigFloat = get_value(reporter, SkFloatToScalar(3.4e38f)); + SkScalar bigFloat = get_value(reporter, 3.4e38f); SkPoint pt = { bigFloat, bigFloat }; SkScalar length = pt.length(); @@ -107,7 +107,7 @@ static void test_overflow(skiatest::Reporter* reporter) { // test that we handle very small values correctly. i.e. that we can // report failure if we try to normalize them. static void test_underflow(skiatest::Reporter* reporter) { - SkPoint pt = { SkFloatToScalar(1.0e-37f), SkFloatToScalar(1.0e-37f) }; + SkPoint pt = { 1.0e-37f, 1.0e-37f }; SkPoint copy = pt; REPORTER_ASSERT(reporter, 0 == SkPoint::Normalize(&pt)); @@ -127,7 +127,7 @@ DEF_TEST(Point, reporter) { SkScalar fLength; } gRec[] = { { SkIntToScalar(3), SkIntToScalar(4), SkIntToScalar(5) }, - { SkFloatToScalar(0.6f), SkFloatToScalar(0.8f), SK_Scalar1 }, + { 0.6f, 0.8f, SK_Scalar1 }, }; for (size_t i = 0; i < SK_ARRAY_COUNT(gRec); ++i) { |