aboutsummaryrefslogtreecommitdiffhomepage
path: root/tests/ClipperTest.cpp
diff options
context:
space:
mode:
authorGravatar commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-11-25 19:44:07 +0000
committerGravatar commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81>2013-11-25 19:44:07 +0000
commit4b413c8bb123e42ca4b9c7bfa6bc2167283cb84c (patch)
treedae12c217068df2844c0ce18fb2c62311ae8c5e9 /tests/ClipperTest.cpp
parent2a1f4464d150d2dc8c3fe2f39e9fb3503b7f4f54 (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/ClipperTest.cpp')
-rw-r--r--tests/ClipperTest.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/ClipperTest.cpp b/tests/ClipperTest.cpp
index b4eee60c01..a81e6559f9 100644
--- a/tests/ClipperTest.cpp
+++ b/tests/ClipperTest.cpp
@@ -22,8 +22,8 @@ static void test_hairclipping(skiatest::Reporter* reporter) {
SkCanvas canvas(bm);
canvas.clipRect(SkRect::MakeWH(SkIntToScalar(4), SkIntToScalar(2)));
- canvas.drawLine(SkFloatToScalar(1.5f), SkFloatToScalar(1.5f),
- SkFloatToScalar(3.5f), SkFloatToScalar(3.5f), paint);
+ canvas.drawLine(1.5f, 1.5f,
+ 3.5f, 3.5f, paint);
/**
* We had a bug where we misinterpreted the bottom of the clip, and
@@ -52,10 +52,10 @@ static void test_edgeclipper() {
SkEdgeClipper clipper;
const SkPoint pts[] = {
- { SkFloatToScalar(3.0995476e+010f), SkFloatToScalar(42.929779f) },
- { SkFloatToScalar(-3.0995163e+010f), SkFloatToScalar(51.050385f) },
- { SkFloatToScalar(-3.0995157e+010f), SkFloatToScalar(51.050392f) },
- { SkFloatToScalar(-3.0995134e+010f), SkFloatToScalar(51.050400f) },
+ { 3.0995476e+010f, 42.929779f },
+ { -3.0995163e+010f, 51.050385f },
+ { -3.0995157e+010f, 51.050392f },
+ { -3.0995134e+010f, 51.050400f },
};
const SkRect clip = { 0, 0, SkIntToScalar(300), SkIntToScalar(200) };