diff options
| author |  reed <reed@google.com> | 2015-05-12 10:37:34 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-05-12 10:37:34 -0700 |
| commit | 80ea19ca4bdd68c1493666a5fe7e4ce9d43ded8b (patch) | |
| tree | 1ad73d17a3314363d114ddc95932e271ae1e828a /include/core/SkScalar.h | |
| parent | 1ebf0d2edc48f886521e6f03af78ef5da24c7982 (diff) | |
Revert of Revert of stop calling SkScalarDiv (patchset #1 id:1 of https://codereview.chromium.org/1138263002/)
Reason for revert:
android patched, blink has rolled
Original issue's description:
> 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:
>
> Committed: https://skia.googlesource.com/skia/+/2629697933b5cc975e45d2a45c48f803fc6cbcec
TBR=
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Review URL: https://codereview.chromium.org/1135693003
Diffstat (limited to 'include/core/SkScalar.h')
| -rw-r--r-- | include/core/SkScalar.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/core/SkScalar.h b/include/core/SkScalar.h index 443454a2ef..2c42eb8e89 100644 --- a/include/core/SkScalar.h +++ b/include/core/SkScalar.h @@ -184,7 +184,9 @@ static inline SkScalar SkScalarSquare(SkScalar x) { return x * x; } #define SkScalarMul(a, b) ((SkScalar)(a) * (b)) #define SkScalarMulAdd(a, b, c) ((SkScalar)(a) * (b) + (c)) -#define SkScalarDiv(a, b) ((SkScalar)(a) / (b)) +#ifdef SK_SUPPORT_LEGACY_SCALAR_DIV + #define SkScalarDiv(a, b) ((SkScalar)(a) / (b)) +#endif #define SkScalarMulDiv(a, b, c) ((SkScalar)(a) * (b) / (c)) #define SkScalarInvert(x) (SK_Scalar1 / (x)) #define SkScalarFastInvert(x) (SK_Scalar1 / (x)) |