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/ColorFilterBench.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/ColorFilterBench.cpp')
-rw-r--r-- | bench/ColorFilterBench.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/bench/ColorFilterBench.cpp b/bench/ColorFilterBench.cpp index 6d98a0eabc..ad27f15806 100644 --- a/bench/ColorFilterBench.cpp +++ b/bench/ColorFilterBench.cpp @@ -28,7 +28,7 @@ protected: } static SkImageFilter* make_brightness(float amount, SkImageFilter* input = NULL) { - SkScalar amount255 = SkScalarMul(SkFloatToScalar(amount), SkIntToScalar(255)); + SkScalar amount255 = SkScalarMul(amount, SkIntToScalar(255)); SkScalar matrix[20] = { 1, 0, 0, 0, amount255, 0, 1, 0, 0, amount255, 0, 0, 1, 0, amount255, @@ -40,10 +40,10 @@ protected: static SkImageFilter* make_grayscale(SkImageFilter* input = NULL) { SkScalar matrix[20]; memset(matrix, 0, 20 * sizeof(SkScalar)); - matrix[0] = matrix[5] = matrix[10] = SkFloatToScalar(0.2126f); - matrix[1] = matrix[6] = matrix[11] = SkFloatToScalar(0.7152f); - matrix[2] = matrix[7] = matrix[12] = SkFloatToScalar(0.0722f); - matrix[18] = SkFloatToScalar(1.0f); + matrix[0] = matrix[5] = matrix[10] = 0.2126f; + matrix[1] = matrix[6] = matrix[11] = 0.7152f; + matrix[2] = matrix[7] = matrix[12] = 0.0722f; + matrix[18] = 1.0f; SkAutoTUnref<SkColorFilter> filter(new SkColorMatrixFilter(matrix)); return SkColorFilterImageFilter::Create(filter, input); } |