| Index: src/core/SkFDot6.h
|
| diff --git a/src/core/SkFDot6.h b/src/core/SkFDot6.h
|
| index afb369e9b2777d339f78a58014f78d95fa058ce2..5a0ec57f5954d7a0c3c5abfee64f39418e849c75 100644
|
| --- a/src/core/SkFDot6.h
|
| +++ b/src/core/SkFDot6.h
|
| @@ -39,13 +39,8 @@ inline SkFixed SkFDot6ToFixed(SkFDot6 x) {
|
| return x << 10;
|
| }
|
|
|
| -#ifdef SK_SCALAR_IS_FLOAT
|
| - #define SkScalarToFDot6(x) (SkFDot6)((x) * 64)
|
| - #define SkFDot6ToScalar(x) ((SkScalar)(x) * 0.015625f)
|
| -#else
|
| - #define SkScalarToFDot6(x) ((x) >> 10)
|
| - #define SkFDot6ToScalar(x) ((x) << 10)
|
| -#endif
|
| +#define SkScalarToFDot6(x) (SkFDot6)((x) * 64)
|
| +#define SkFDot6ToScalar(x) ((SkScalar)(x) * 0.015625f)
|
|
|
| inline SkFixed SkFDot6Div(SkFDot6 a, SkFDot6 b) {
|
| SkASSERT(b != 0);
|
|
|