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 /tests/DrawBitmapRectTest.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 'tests/DrawBitmapRectTest.cpp')
| -rw-r--r-- | tests/DrawBitmapRectTest.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/tests/DrawBitmapRectTest.cpp b/tests/DrawBitmapRectTest.cpp index ab667fdfae..4c6d634eb0 100644 --- a/tests/DrawBitmapRectTest.cpp +++ b/tests/DrawBitmapRectTest.cpp @@ -120,13 +120,13 @@ static void test_treatAsSprite(skiatest::Reporter* reporter) { size.set(500, 600); - const SkScalar tooMuchSubpixel = SkFloatToScalar(100.1f); + const SkScalar tooMuchSubpixel = 100.1f; mat.setTranslate(tooMuchSubpixel, 0); REPORTER_ASSERT(reporter, !treat_as_sprite(mat, size, bilerBits)); mat.setTranslate(0, tooMuchSubpixel); REPORTER_ASSERT(reporter, !treat_as_sprite(mat, size, bilerBits)); - const SkScalar tinySubPixel = SkFloatToScalar(100.02f); + const SkScalar tinySubPixel = 100.02f; mat.setTranslate(tinySubPixel, 0); REPORTER_ASSERT(reporter, treat_as_sprite(mat, size, bilerBits)); mat.setTranslate(0, tinySubPixel); @@ -181,12 +181,12 @@ static void test_wacky_bitmapshader(skiatest::Reporter* reporter, SkMatrix matrix; SkCanvas c(dev); - matrix.setAll(SkFloatToScalar(-119.34097f), - SkFloatToScalar(-43.436558f), - SkFloatToScalar(93489.945f), - SkFloatToScalar(43.436558f), - SkFloatToScalar(-119.34097f), - SkFloatToScalar(123.98426f), + matrix.setAll(-119.34097f, + -43.436558f, + 93489.945f, + 43.436558f, + -119.34097f, + 123.98426f, 0, 0, SK_Scalar1); c.concat(matrix); @@ -197,11 +197,11 @@ static void test_wacky_bitmapshader(skiatest::Reporter* reporter, SkShader* s = SkShader::CreateBitmapShader(bm, SkShader::kRepeat_TileMode, SkShader::kRepeat_TileMode); - matrix.setAll(SkFloatToScalar(0.0078740157f), + matrix.setAll(0.0078740157f, 0, SkIntToScalar(249), 0, - SkFloatToScalar(0.0078740157f), + 0.0078740157f, SkIntToScalar(239), 0, 0, SK_Scalar1); s->setLocalMatrix(matrix); |