diff options
| author |  reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-12-17 16:44:46 +0000 |
|---|---|---|
| committer | reed@google.com <reed@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-12-17 16:44:46 +0000 |
| commit | 8f4d2306fa866a26f9448048ff63f692b2ba43aa (patch) | |
| tree | 7a48d817cb5220f87e81781320b002eead2495a0 /src/core/SkFDot6.h | |
| parent | a34b638b909f58dd7c66546a0f49923112f7f785 (diff) | |
remove SK_SCALAR_IS_[FLOAT,FIXED] and assume floats
To keep the CL (slightly) managable, this does not make any changes to
existing macros (e.g. SkScalarMul). Just tackling #ifdef constructs this
time around.
BUG=
R=bsalomon@google.com, caryclark@google.com
Review URL: https://codereview.chromium.org/117053002
git-svn-id: http://skia.googlecode.com/svn/trunk@12712 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/core/SkFDot6.h')
| -rw-r--r-- | src/core/SkFDot6.h | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/core/SkFDot6.h b/src/core/SkFDot6.h index afb369e9b2..5a0ec57f59 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); |