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/animator/SkDisplayMath.cpp | |
| 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/animator/SkDisplayMath.cpp')
| -rw-r--r-- | src/animator/SkDisplayMath.cpp | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/src/animator/SkDisplayMath.cpp b/src/animator/SkDisplayMath.cpp index bdf377b302..ac2ba8bf24 100644 --- a/src/animator/SkDisplayMath.cpp +++ b/src/animator/SkDisplayMath.cpp @@ -21,7 +21,6 @@ enum SkDisplayMath_Properties { }; const SkScalar SkDisplayMath::gConstants[] = { -#ifdef SK_SCALAR_IS_FLOAT 2.718281828f, // E 2.302585093f, // LN10 0.693147181f, // LN2 @@ -30,16 +29,6 @@ const SkScalar SkDisplayMath::gConstants[] = { 3.141592654f, // PI 0.707106781f, // SQRT1_2 1.414213562f // SQRT2 -#else - 0x2B7E1, // E - 0x24D76, // LN10 - 0xB172, // LN2 - 0x6F2E, // LOG10E - 0x17154, // LOG2E - 0x3243F, // PI - 0xB505, // SQRT1_2 - 0x16A0A // SQRT2 -#endif }; enum SkDisplayMath_Functions { |