aboutsummaryrefslogtreecommitdiffhomepage
path: root/gm/hairlines.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 /gm/hairlines.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 'gm/hairlines.cpp')
-rw-r--r--gm/hairlines.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/gm/hairlines.cpp b/gm/hairlines.cpp
index d0f141ba91..fb99d238ea 100644
--- a/gm/hairlines.cpp
+++ b/gm/hairlines.cpp
@@ -95,13 +95,13 @@ protected:
{
SkPath* problem2 = &fPaths.push_back();
problem2->moveTo(SkIntToScalar(5), SkIntToScalar(1));
- problem2->lineTo(SkFloatToScalar(4.32787323f), SkFloatToScalar(1.67212653f));
- problem2->cubicTo(SkFloatToScalar(2.75223875f), SkFloatToScalar(3.24776125f),
- SkFloatToScalar(3.00581908f), SkFloatToScalar(4.51236057f),
- SkFloatToScalar(3.7580452f), SkFloatToScalar(4.37367964f));
- problem2->cubicTo(SkFloatToScalar(4.66472578f), SkFloatToScalar(3.888381f),
- SkFloatToScalar(5.f), SkFloatToScalar(2.875f),
- SkFloatToScalar(5.f), SkFloatToScalar(1.f));
+ problem2->lineTo(4.32787323f, 1.67212653f);
+ problem2->cubicTo(2.75223875f, 3.24776125f,
+ 3.00581908f, 4.51236057f,
+ 3.7580452f, 4.37367964f);
+ problem2->cubicTo(4.66472578f, 3.888381f,
+ 5.f, 2.875f,
+ 5.f, 1.f);
problem2->close();
}
@@ -137,8 +137,8 @@ protected:
{
// Arc example to test imperfect truncation bug (crbug.com/295626)
static const SkScalar kRad = SkIntToScalar(2000);
- static const SkScalar kStartAngle = SkFloatToScalar(262.59717f);
- static const SkScalar kSweepAngle = SkScalarHalf(SkFloatToScalar(17.188717f));
+ static const SkScalar kStartAngle = 262.59717f;
+ static const SkScalar kSweepAngle = SkScalarHalf(17.188717f);
SkPath* bug = &fPaths.push_back();