diff options
Diffstat (limited to 'include/core')
-rw-r--r-- | include/core/SkMatrix.h | 8 | ||||
-rw-r--r-- | include/core/SkPoint.h | 10 | ||||
-rw-r--r-- | include/core/SkScalar.h | 4 |
3 files changed, 2 insertions, 20 deletions
diff --git a/include/core/SkMatrix.h b/include/core/SkMatrix.h index 0252bc7101..89b3072f79 100644 --- a/include/core/SkMatrix.h +++ b/include/core/SkMatrix.h @@ -28,13 +28,7 @@ public: m.setScale(sx, sy); return m; } - - static SkMatrix SK_WARN_UNUSED_RESULT MakeScale(SkScalar scale) { - SkMatrix m; - m.setScale(scale, scale); - return m; - } - + static SkMatrix SK_WARN_UNUSED_RESULT MakeTrans(SkScalar dx, SkScalar dy) { SkMatrix m; m.setTranslate(dx, dy); diff --git a/include/core/SkPoint.h b/include/core/SkPoint.h index 52d01ae88c..4a97391c70 100644 --- a/include/core/SkPoint.h +++ b/include/core/SkPoint.h @@ -348,16 +348,6 @@ struct SK_API SkPoint { fY -= v.fY; } - SkPoint operator*(SkScalar scale) const { - return Make(fX * scale, fY * scale); - } - - SkPoint& operator*=(SkScalar scale) { - fX *= scale; - fY *= scale; - return *this; - } - /** * Returns true if both X and Y are finite (not infinity or NaN) */ diff --git a/include/core/SkScalar.h b/include/core/SkScalar.h index 2c42eb8e89..443454a2ef 100644 --- a/include/core/SkScalar.h +++ b/include/core/SkScalar.h @@ -184,9 +184,7 @@ 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)) -#ifdef SK_SUPPORT_LEGACY_SCALAR_DIV - #define SkScalarDiv(a, b) ((SkScalar)(a) / (b)) -#endif +#define SkScalarDiv(a, b) ((SkScalar)(a) / (b)) #define SkScalarMulDiv(a, b, c) ((SkScalar)(a) * (b) / (c)) #define SkScalarInvert(x) (SK_Scalar1 / (x)) #define SkScalarFastInvert(x) (SK_Scalar1 / (x)) |