diff options
| author |  reed <reed@google.com> | 2015-05-12 10:28:06 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-05-12 10:28:06 -0700 |
| commit | 2629697933b5cc975e45d2a45c48f803fc6cbcec (patch) | |
| tree | 53730ca8354552773d93adfe7ade5f1e2bc18192 /src/core/SkGeometry.cpp | |
| parent | 39a9a5069b25aa8b9529118cfd0ece5f412fb56b (diff) | |
Revert of stop calling SkScalarDiv (patchset #4 id:60001 of https://codereview.chromium.org/1135053002/)
Reason for revert:
need to wait for Blink roll (and patch android)
Original issue's description:
> stop calling SkScalarDiv
>
> BUG=skia:
> TBR=
>
> Committed: https://skia.googlesource.com/skia/+/67d71c898249a7af3523b16c6a69895a63bfae0a
TBR=
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Review URL: https://codereview.chromium.org/1138263002
Diffstat (limited to 'src/core/SkGeometry.cpp')
| -rw-r--r-- | src/core/SkGeometry.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/SkGeometry.cpp b/src/core/SkGeometry.cpp index b4489d28e3..3ee2fa5d26 100644 --- a/src/core/SkGeometry.cpp +++ b/src/core/SkGeometry.cpp @@ -62,7 +62,7 @@ static int valid_unit_divide(SkScalar numer, SkScalar denom, SkScalar* ratio) { return 0; } - SkScalar r = numer / denom; + SkScalar r = SkScalarDiv(numer, denom); if (SkScalarIsNaN(r)) { return 0; } @@ -1149,7 +1149,7 @@ static SkScalar conic_eval_pos(const SkScalar src[], SkScalar w, SkScalar t) { A = -B; SkScalar denom = SkScalarMulAdd(SkScalarMulAdd(A, t, B), t, C); - return numer / denom; + return SkScalarDiv(numer, denom); } // F' = 2 (C t (1 + t (-1 + w)) - A (-1 + t) (t (-1 + w) - w) + B (1 - 2 t) w) |