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 /src/utils | |
| parent | 7da2e55ccbad4868a455c1c9f23e5f63bd99e916 (diff) | |
stop calling SkScalarDiv
BUG=skia:
TBR=
Review URL: https://codereview.chromium.org/1135053002
Diffstat (limited to 'src/utils')
| -rw-r--r-- | src/utils/SkInterpolator.cpp | 3 | ||||
| -rw-r--r-- | src/utils/SkNinePatch.cpp | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/utils/SkInterpolator.cpp b/src/utils/SkInterpolator.cpp index 97574e475b..03e7e4a83f 100644 --- a/src/utils/SkInterpolator.cpp +++ b/src/utils/SkInterpolator.cpp @@ -62,8 +62,7 @@ SkScalar SkInterpolatorBase::ComputeRelativeT(SkMSec time, SkMSec prevTime, SkMSec nextTime, const SkScalar blend[4]) { SkASSERT(time > prevTime && time < nextTime); - SkScalar t = SkScalarDiv((SkScalar)(time - prevTime), - (SkScalar)(nextTime - prevTime)); + SkScalar t = (SkScalar)(time - prevTime) / (SkScalar)(nextTime - prevTime); return blend ? SkUnitCubicInterp(t, blend[0], blend[1], blend[2], blend[3]) : t; } diff --git a/src/utils/SkNinePatch.cpp b/src/utils/SkNinePatch.cpp index 4e0d1d1a39..ce8d4801c6 100644 --- a/src/utils/SkNinePatch.cpp +++ b/src/utils/SkNinePatch.cpp @@ -161,7 +161,7 @@ void SkNinePatch::DrawMesh(SkCanvas* canvas, const SkRect& bounds, if (bounds.width() >= fixed) stretchX = (bounds.width() - fixed) / stretchSize; else // reuse stretchX, but keep it negative as a signal - stretchX = SkScalarDiv(-bounds.width(), fixed); + stretchX = -bounds.width() / fixed; } if (numYStretch > 0) { @@ -173,7 +173,7 @@ void SkNinePatch::DrawMesh(SkCanvas* canvas, const SkRect& bounds, if (bounds.height() >= fixed) stretchY = (bounds.height() - fixed) / stretchSize; else // reuse stretchX, but keep it negative as a signal - stretchY = SkScalarDiv(-bounds.height(), fixed); + stretchY = -bounds.height() / fixed; } #if 0 |