diff options
author | reed <reed@google.com> | 2015-05-12 09:47:22 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-05-12 09:47:22 -0700 |
commit | 67d71c898249a7af3523b16c6a69895a63bfae0a (patch) | |
tree | 718e9b0eb395ffd67ec0e1bcf3074f0289f89600 /experimental/StrokePathRenderer | |
parent | 7da2e55ccbad4868a455c1c9f23e5f63bd99e916 (diff) |
stop calling SkScalarDiv
BUG=skia:
TBR=
Review URL: https://codereview.chromium.org/1135053002
Diffstat (limited to 'experimental/StrokePathRenderer')
-rw-r--r-- | experimental/StrokePathRenderer/GrStrokePathRenderer.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/experimental/StrokePathRenderer/GrStrokePathRenderer.cpp b/experimental/StrokePathRenderer/GrStrokePathRenderer.cpp index 4b41dba5b1..e693c41a66 100644 --- a/experimental/StrokePathRenderer/GrStrokePathRenderer.cpp +++ b/experimental/StrokePathRenderer/GrStrokePathRenderer.cpp @@ -39,8 +39,8 @@ static IntersectionType intersection(const SkPoint& p1, const SkPoint& p2, SkScalar pre = SkScalarMul(x1, y2) - SkScalarMul(y1, x2), post = SkScalarMul(x3, y4) - SkScalarMul(y3, x4); // Compute the point of intersection - res.set(SkScalarDiv(SkScalarMul(pre, x3 - x4) - SkScalarMul(x1 - x2, post), d), - SkScalarDiv(SkScalarMul(pre, y3 - y4) - SkScalarMul(y1 - y2, post), d)); + res.set((SkScalarMul(pre, x3 - x4) - SkScalarMul(x1 - x2, post) / d, + (SkScalarMul(pre, y3 - y4) - SkScalarMul(y1 - y2, post) / d); // Check if the x and y coordinates are within both lines return (res.x() < GrMin(x1, x2) || res.x() > GrMax(x1, x2) || @@ -184,9 +184,7 @@ bool GrStrokePathRenderer::onDrawPath(const SkPath& origPath, SkPoint miterPt1 = miterPt[0] - *pt1; SkScalar sqDist0 = miterPt0.dot(miterPt0); SkScalar sqDist1 = miterPt1.dot(miterPt1); - const SkScalar rSq = - SkScalarDiv(SkScalarMul(radius, radius), - sinHalfAngleSq); + const SkScalar rSq = radius*radius / sinHalfAngleSq; const SkScalar sqRLimit = SkScalarMul(sqMiterLimit, rSq); if (sqDist0 > sqRLimit || sqDist1 > sqRLimit) { |