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 /bench/MatrixBench.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 'bench/MatrixBench.cpp')
| -rw-r--r-- | bench/MatrixBench.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/bench/MatrixBench.cpp b/bench/MatrixBench.cpp index c2d68b5b85..4b8cf0223e 100644 --- a/bench/MatrixBench.cpp +++ b/bench/MatrixBench.cpp @@ -74,7 +74,7 @@ private: class ScaleMatrixBench : public MatrixBench { public: ScaleMatrixBench() : INHERITED("scale") { - fSX = fSY = SkFloatToScalar(1.5f); + fSX = fSY = 1.5f; fM0.reset(); fM1.setScale(fSX, fSY); fM2.setTranslate(fSX, fSY); @@ -383,17 +383,17 @@ public: fMatrix.reset(); fIteration = 0; if (flags & kScale_Flag) { - fMatrix.postScale(SkFloatToScalar(1.5f), SkFloatToScalar(2.5f)); + fMatrix.postScale(1.5f, 2.5f); } if (flags & kTranslate_Flag) { - fMatrix.postTranslate(SkFloatToScalar(1.5f), SkFloatToScalar(2.5f)); + fMatrix.postTranslate(1.5f, 2.5f); } if (flags & kRotate_Flag) { - fMatrix.postRotate(SkFloatToScalar(45.0f)); + fMatrix.postRotate(45.0f); } if (flags & kPerspective_Flag) { - fMatrix.setPerspX(SkFloatToScalar(1.5f)); - fMatrix.setPerspY(SkFloatToScalar(2.5f)); + fMatrix.setPerspX(1.5f); + fMatrix.setPerspY(2.5f); } if (0 == (flags & kUncachedTypeMask_Flag)) { fMatrix.getType(); |