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/xps/SkXPSDevice.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/xps/SkXPSDevice.cpp')
| -rw-r--r-- | src/xps/SkXPSDevice.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/xps/SkXPSDevice.cpp b/src/xps/SkXPSDevice.cpp index 8dca7f0156..5b52ab8b04 100644 --- a/src/xps/SkXPSDevice.cpp +++ b/src/xps/SkXPSDevice.cpp @@ -496,8 +496,8 @@ static void transform_offsets(SkScalar* stopOffsets, const int numOffsets, for (int i = 0; i < numOffsets; ++i) { SkPoint stop; - stop.fX = SkScalarMul(end.fX - start.fX, stopOffsets[i]); - stop.fY = SkScalarMul(end.fY - start.fY, stopOffsets[i]); + stop.fX = (end.fX - start.fX) * stopOffsets[i]; + stop.fY = (end.fY - start.fY) * stopOffsets[i]; SkPoint stopTransformed; transform.mapXY(stop.fX, stop.fY, &stopTransformed); @@ -1387,11 +1387,10 @@ void SkXPSDevice::convertToPpm(const SkMaskFilter* filter, matrix->postScale(ppuScale->fX, ppuScale->fY); const SkIRect& irect = clip; - SkRect clipRect = SkRect::MakeLTRB( - SkScalarMul(SkIntToScalar(irect.fLeft), ppuScale->fX), - SkScalarMul(SkIntToScalar(irect.fTop), ppuScale->fY), - SkScalarMul(SkIntToScalar(irect.fRight), ppuScale->fX), - SkScalarMul(SkIntToScalar(irect.fBottom), ppuScale->fY)); + SkRect clipRect = SkRect::MakeLTRB(SkIntToScalar(irect.fLeft) * ppuScale->fX, + SkIntToScalar(irect.fTop) * ppuScale->fY, + SkIntToScalar(irect.fRight) * ppuScale->fX, + SkIntToScalar(irect.fBottom) * ppuScale->fY); clipRect.roundOut(clipIRect); } |