src/core/SkStroke.cpp - Issue 1138263002: Revert of stop calling SkScalarDiv

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: src/core/SkStroke.cpp

Issue 1138263002: Revert of stop calling SkScalarDiv (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: Created 5 years, 7 months 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: src/core/SkStroke.cpp

diff --git a/src/core/SkStroke.cpp b/src/core/SkStroke.cpp

index 6454f1694dd960c6018a00be8103e8d08798b215..a3641ffc4fa55aa9fc86f9cf3312f87f2affcb68 100644

--- a/src/core/SkStroke.cpp

+++ b/src/core/SkStroke.cpp

@@ -454,7 +454,8 @@

normalB = pts[2] - pts[0];

normalB.rotateCCW();

SkScalar dot = SkPoint::DotProduct(unitNormalAB, *unitNormalBC);

- SkAssertResult(normalB.setLength(fRadius / SkScalarSqrt((SK_Scalar1 + dot)/2)));

+ SkAssertResult(normalB.setLength(SkScalarDiv(fRadius,

+ SkScalarSqrt((SK_Scalar1 + dot)/2))));

fOuter.quadTo( pts[1].fX + normalB.fX, pts[1].fY + normalB.fY,

pts[2].fX + normalBC->fX, pts[2].fY + normalBC->fY);

@@ -760,9 +761,11 @@

normalC = *unitNormalCD + unitBC;

SkScalar dot = SkPoint::DotProduct(unitNormalAB, unitBC);

- SkAssertResult(normalB.setLength(fRadius / SkScalarSqrt((SK_Scalar1 + dot)/2)));

+ SkAssertResult(normalB.setLength(SkScalarDiv(fRadius,

+ SkScalarSqrt((SK_Scalar1 + dot)/2))));

dot = SkPoint::DotProduct(*unitNormalCD, unitBC);

- SkAssertResult(normalC.setLength(fRadius / SkScalarSqrt((SK_Scalar1 + dot)/2)));

+ SkAssertResult(normalC.setLength(SkScalarDiv(fRadius,

+ SkScalarSqrt((SK_Scalar1 + dot)/2))));

fOuter.cubicTo( pts[1].fX + normalB.fX, pts[1].fY + normalB.fY,

pts[2].fX + normalC.fX, pts[2].fY + normalC.fY,

« no previous file with comments | « src/core/SkScalar.cpp ('k') | src/core/SkStrokerPriv.cpp » ('j') | no next file with comments »