diff options
| author |  Mike Reed <reed@google.com> | 2017-02-14 10:59:19 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-02-14 19:45:24 +0000 |
| commit | df85c38163245c7fc3c23cad3a4ad104949f3a62 (patch) | |
| tree | 9f56ae6ce07ee9ae6a87e2bd2c52ee787fee7b32 /include/core/SkScalar.h | |
| parent | 78c0c4c5a0bed8ac54542d2d378a0fc9ec8c034b (diff) | |
stop using SkScalarMul
BUG=skia:
Change-Id: Ie41d8665a1c62ba8eddc93d8cfefaf64ddc52ff8
Reviewed-on: https://skia-review.googlesource.com/8411
Reviewed-by: Ben Wagner <bungeman@google.com>
Commit-Queue: Mike Reed <reed@google.com>
Diffstat (limited to 'include/core/SkScalar.h')
| -rw-r--r-- | include/core/SkScalar.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/include/core/SkScalar.h b/include/core/SkScalar.h index c4bfce8779..0dd968c7c3 100644 --- a/include/core/SkScalar.h +++ b/include/core/SkScalar.h @@ -134,9 +134,6 @@ SkScalar SkScalarSinCos(SkScalar radians, SkScalar* cosValue); 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 SkScalarMulDiv(a, b, c) ((SkScalar)(a) * (b) / (c)) #define SkScalarInvert(x) (SK_Scalar1 / (x)) #define SkScalarFastInvert(x) (SK_Scalar1 / (x)) #define SkScalarAve(a, b) (((a) + (b)) * SK_ScalarHalf) @@ -218,4 +215,10 @@ static inline bool SkScalarsEqual(const SkScalar a[], const SkScalar b[], int n) return true; } +#ifdef SK_SUPPORT_LEGACY_SCALARMUL + #define SkScalarMul(a, b) ((SkScalar)(a) * (b)) + #define SkScalarMulAdd(a, b, c) ((SkScalar)(a) * (b) + (c)) + #define SkScalarMulDiv(a, b, c) ((SkScalar)(a) * (b) / (c)) +#endif + #endif |