aboutsummaryrefslogtreecommitdiffhomepage
path: root/samplecode/SampleAll.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 /samplecode/SampleAll.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 'samplecode/SampleAll.cpp')
-rw-r--r--samplecode/SampleAll.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/samplecode/SampleAll.cpp b/samplecode/SampleAll.cpp
index 133b653c07..8907a349e8 100644
--- a/samplecode/SampleAll.cpp
+++ b/samplecode/SampleAll.cpp
@@ -285,8 +285,8 @@ protected:
path.addCircle(SkIntToScalar(20), SkIntToScalar(20), SkIntToScalar(20),
SkPath::kCCW_Direction);
for (int index = 0; index < 10; index++) {
- SkScalar x = SkFloatToScalar((float) cos(index / 10.0f * 2 * 3.1415925358f));
- SkScalar y = SkFloatToScalar((float) sin(index / 10.0f * 2 * 3.1415925358f));
+ SkScalar x = (float) cos(index / 10.0f * 2 * 3.1415925358f);
+ SkScalar y = (float) sin(index / 10.0f * 2 * 3.1415925358f);
x *= index & 1 ? 7 : 14;
y *= index & 1 ? 7 : 14;
x += SkIntToScalar(20);