diff options
Diffstat (limited to 'include/core/SkScalar.h')
| -rw-r--r-- | include/core/SkScalar.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/include/core/SkScalar.h b/include/core/SkScalar.h index 47c74bc5a9..b2d966cb3b 100644 --- a/include/core/SkScalar.h +++ b/include/core/SkScalar.h @@ -8,7 +8,6 @@ #ifndef SkScalar_DEFINED #define SkScalar_DEFINED -#include "../private/SkFixed.h" #include "../private/SkFloatingPoint.h" // TODO: move this sort of check into SkPostConfig.h @@ -32,9 +31,6 @@ typedef float SkScalar; #define SK_ScalarNegativeInfinity SK_FloatNegativeInfinity #define SK_ScalarNaN SK_FloatNaN -#define SkFixedToScalar(x) SkFixedToFloat(x) -#define SkScalarToFixed(x) SkFloatToFixed(x) - #define SkScalarFloorToScalar(x) sk_float_floor(x) #define SkScalarCeilToScalar(x) sk_float_ceil(x) #define SkScalarRoundToScalar(x) sk_float_floor((x) + 0.5f) @@ -75,9 +71,6 @@ typedef double SkScalar; #define SK_ScalarNegativeInfinity SK_DoubleNegativeInfinity #define SK_ScalarNaN SK_DoubleNaN -#define SkFixedToScalar(x) SkFixedToDouble(x) -#define SkScalarToFixed(x) SkDoubleToFixed(x) - #define SkScalarFloorToScalar(x) floor(x) #define SkScalarCeilToScalar(x) ceil(x) #define SkScalarRoundToScalar(x) floor((x) + 0.5) |