diff options
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 |