diff options
| author |  Mike Reed <reed@google.com> | 2017-02-13 20:44:33 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-02-14 14:43:47 +0000 |
| commit | 8be952ad8c9deefe19cff36f9ad217563400f817 (patch) | |
| tree | 3879f25fb86ed01ffd3817b510bd8a63423f9e8d /src/effects/SkDashPathEffect.cpp | |
| parent | 351549febad86d785aab6c985c9489d55a0bd2a4 (diff) | |
SkScalarMul is deprecated
BUG=skia:
Change-Id: I88ecfe9d4c72506f6b1a0e0dfadd2a5c171a6cb6
Reviewed-on: https://skia-review.googlesource.com/8353
Commit-Queue: Ben Wagner <bungeman@google.com>
Reviewed-by: Ben Wagner <bungeman@google.com>
Diffstat (limited to 'src/effects/SkDashPathEffect.cpp')
| -rw-r--r-- | src/effects/SkDashPathEffect.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/effects/SkDashPathEffect.cpp b/src/effects/SkDashPathEffect.cpp index 1dbf293361..b1029e1eef 100644 --- a/src/effects/SkDashPathEffect.cpp +++ b/src/effects/SkDashPathEffect.cpp @@ -47,7 +47,7 @@ static void outset_for_stroke(SkRect* rect, const SkStrokeRec& rec) { radius = SK_Scalar1; // hairlines } if (SkPaint::kMiter_Join == rec.getJoin()) { - radius = SkScalarMul(radius, rec.getMiter()); + radius *= rec.getMiter(); } rect->outset(radius, radius); } @@ -280,8 +280,8 @@ bool SkDashPathEffect::asPoints(PointData* results, if (clampedInitialDashLength > 0) { // partial first block SkASSERT(SkPaint::kRound_Cap != rec.getCap()); // can't handle partial circles - SkScalar x = pts[0].fX + SkScalarMul(tangent.fX, SkScalarHalf(clampedInitialDashLength)); - SkScalar y = pts[0].fY + SkScalarMul(tangent.fY, SkScalarHalf(clampedInitialDashLength)); + SkScalar x = pts[0].fX + tangent.fX * SkScalarHalf(clampedInitialDashLength); + SkScalar y = pts[0].fY + tangent.fY * SkScalarHalf(clampedInitialDashLength); SkScalar halfWidth, halfHeight; if (isXAxis) { halfWidth = SkScalarHalf(clampedInitialDashLength); @@ -313,8 +313,8 @@ bool SkDashPathEffect::asPoints(PointData* results, distance += SkScalarHalf(fIntervals[0]); for (int i = 0; i < numMidPoints; ++i) { - SkScalar x = pts[0].fX + SkScalarMul(tangent.fX, distance); - SkScalar y = pts[0].fY + SkScalarMul(tangent.fY, distance); + SkScalar x = pts[0].fX + tangent.fX * distance; + SkScalar y = pts[0].fY + tangent.fY * distance; SkASSERT(curPt < results->fNumPoints); results->fPoints[curPt].set(x, y); @@ -331,8 +331,8 @@ bool SkDashPathEffect::asPoints(PointData* results, SkASSERT(SkPaint::kRound_Cap != rec.getCap()); // can't handle partial circles SkScalar temp = length - distance; SkASSERT(temp < fIntervals[0]); - SkScalar x = pts[0].fX + SkScalarMul(tangent.fX, distance + SkScalarHalf(temp)); - SkScalar y = pts[0].fY + SkScalarMul(tangent.fY, distance + SkScalarHalf(temp)); + SkScalar x = pts[0].fX + tangent.fX * (distance + SkScalarHalf(temp)); + SkScalar y = pts[0].fY + tangent.fY * (distance + SkScalarHalf(temp)); SkScalar halfWidth, halfHeight; if (isXAxis) { halfWidth = SkScalarHalf(temp); |