tests/RoundRectTest.cpp - Issue 85463005: remove SkFloatToScalar macro

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: tests/RoundRectTest.cpp

Issue 85463005: remove SkFloatToScalar macro (Closed) Base URL: https://skia.googlecode.com/svn/trunk

Patch Set: add failing test back Created 7 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: tests/RoundRectTest.cpp

diff --git a/tests/RoundRectTest.cpp b/tests/RoundRectTest.cpp

index 95e455d29b4e685dccf652e0be00a464f6408b36..7cadf0187113ecff061bb01fb0698be471d9ea39 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);