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 /samplecode/SamplePolyToPoly.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 'samplecode/SamplePolyToPoly.cpp')
| -rw-r--r-- | samplecode/SamplePolyToPoly.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/samplecode/SamplePolyToPoly.cpp b/samplecode/SamplePolyToPoly.cpp index a0401f6339..1283a23bc5 100644 --- a/samplecode/SamplePolyToPoly.cpp +++ b/samplecode/SamplePolyToPoly.cpp @@ -41,11 +41,11 @@ public: m1.reset(); const SkScalar src1[] = { - 0, 0, 0, SkFloatToScalar(427), SkFloatToScalar(316), SkFloatToScalar(427), SkFloatToScalar(316), 0 + 0, 0, 0, 427, 316, 427, 316, 0 }; const SkScalar dst1[] = { - SkFloatToScalar(158), SkFloatToScalar(177.5f), SkFloatToScalar(158), SkFloatToScalar(249.5f), - SkFloatToScalar(158), SkFloatToScalar(604.5f), SkFloatToScalar(158), SkFloatToScalar(-177.5f) + 158, 177.5f, 158, 249.5f, + 158, 604.5f, 158, -177.5f }; (void) m2.setPolyToPoly((const SkPoint*)src1, (SkPoint*)dst1, 4); @@ -112,7 +112,7 @@ protected: SkString str; str.appendS32(count); canvas->drawText(str.c_str(), str.size(), - x, SkFloatToScalar(y), + x, y, *paint); canvas->restore(); |