aboutsummaryrefslogtreecommitdiffhomepage
path: root/tests/ParsePathTest.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/ParsePathTest.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/ParsePathTest.cpp')
-rw-r--r--tests/ParsePathTest.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/ParsePathTest.cpp b/tests/ParsePathTest.cpp
index c91186005a..4d0fdba2b8 100644
--- a/tests/ParsePathTest.cpp
+++ b/tests/ParsePathTest.cpp
@@ -34,8 +34,8 @@ static struct {
{ "", { 0, 0, 0, 0 } },
{ "M0,0L10,10", { 0, 0, SkIntToScalar(10), SkIntToScalar(10) } },
{ "M-5.5,-0.5 Q 0 0 6,6.50",
- { SkFloatToScalar(-5.5f), SkFloatToScalar(-0.5f),
- SkFloatToScalar(6), SkFloatToScalar(6.5f) } }
+ { -5.5f, -0.5f,
+ 6, 6.5f } }
};
static void TestParsePath(skiatest::Reporter* reporter) {
@@ -51,13 +51,13 @@ static void TestParsePath(skiatest::Reporter* reporter) {
}
SkRect r;
- r.set(0, 0, SkFloatToScalar(10), SkFloatToScalar(10.5f));
+ r.set(0, 0, 10, 10.5f);
SkPath p;
p.addRect(r);
test_to_from(reporter, p);
p.addOval(r);
test_to_from(reporter, p);
- p.addRoundRect(r, SkFloatToScalar(4), SkFloatToScalar(4.5f));
+ p.addRoundRect(r, 4, 4.5f);
test_to_from(reporter, p);
}