| Index: src/core/SkBitmapProcState.h
|
| diff --git a/src/core/SkBitmapProcState.h b/src/core/SkBitmapProcState.h
|
| index ac4f1a47102c950d0822dfed60c9772cec795b72..dd1f0bff4515ccb2db4dd29bb95dea5610d64511 100644
|
| --- a/src/core/SkBitmapProcState.h
|
| +++ b/src/core/SkBitmapProcState.h
|
| @@ -14,21 +14,11 @@
|
| #include "SkMipMap.h"
|
| #include "SkPaint.h"
|
|
|
| -#define FractionalInt_IS_64BIT
|
| -
|
| -#ifdef FractionalInt_IS_64BIT
|
| - typedef SkFixed48 SkFractionalInt;
|
| - #define SkScalarToFractionalInt(x) SkScalarToFixed48(x)
|
| - #define SkFractionalIntToFixed(x) SkFixed48ToFixed(x)
|
| - #define SkFixedToFractionalInt(x) SkFixedToFixed48(x)
|
| - #define SkFractionalIntToInt(x) SkFixed48ToInt(x)
|
| -#else
|
| - typedef SkFixed SkFractionalInt;
|
| - #define SkScalarToFractionalInt(x) SkScalarToFixed(x)
|
| - #define SkFractionalIntToFixed(x) (x)
|
| - #define SkFixedToFractionalInt(x) (x)
|
| - #define SkFractionalIntToInt(x) ((x) >> 16)
|
| -#endif
|
| +typedef SkFixed3232 SkFractionalInt;
|
| +#define SkScalarToFractionalInt(x) SkScalarToFixed3232(x)
|
| +#define SkFractionalIntToFixed(x) SkFixed3232ToFixed(x)
|
| +#define SkFixedToFractionalInt(x) SkFixedToFixed3232(x)
|
| +#define SkFractionalIntToInt(x) SkFixed3232ToInt(x)
|
|
|
| class SkPaint;
|
|
|
|
|