From 4b413c8bb123e42ca4b9c7bfa6bc2167283cb84c Mon Sep 17 00:00:00 2001 From: "commit-bot@chromium.org" Date: Mon, 25 Nov 2013 19:44:07 +0000 Subject: 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 --- tests/RoundRectTest.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'tests/RoundRectTest.cpp') diff --git a/tests/RoundRectTest.cpp b/tests/RoundRectTest.cpp index 95e455d29b..7cadf01871 100644 --- a/tests/RoundRectTest.cpp +++ b/tests/RoundRectTest.cpp @@ -9,8 +9,8 @@ #include "SkMatrix.h" #include "SkRRect.h" -static const SkScalar kWidth = SkFloatToScalar(100.0f); -static const SkScalar kHeight = SkFloatToScalar(100.0f); +static const SkScalar kWidth = 100.0f; +static const SkScalar kHeight = 100.0f; static void test_inset(skiatest::Reporter* reporter) { SkRRect rr, rr2; @@ -510,7 +510,7 @@ static void test_transform_helper(skiatest::Reporter* reporter, const SkRRect& o // Scale in both directions. SkScalar xScale = SkIntToScalar(3); - SkScalar yScale = SkFloatToScalar(3.2f); + SkScalar yScale = 3.2f; matrix.reset(); matrix.setScaleX(xScale); matrix.setScaleY(yScale); -- cgit v1.2.3