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/utils/SkInterpolator.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/utils/SkInterpolator.cpp')
-rw-r--r-- | src/utils/SkInterpolator.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/utils/SkInterpolator.cpp b/src/utils/SkInterpolator.cpp index 2853b0703a..595e46402d 100644 --- a/src/utils/SkInterpolator.cpp +++ b/src/utils/SkInterpolator.cpp @@ -155,11 +155,7 @@ void SkInterpolator::reset(int elemCount, int frameCount) { #define SK_Fixed2Third (SK_Fixed1*2/3) static const SkScalar gIdentityBlend[4] = { -#ifdef SK_SCALAR_IS_FLOAT 0.33333333f, 0.33333333f, 0.66666667f, 0.66666667f -#else - SK_Fixed1Third, SK_Fixed1Third, SK_Fixed2Third, SK_Fixed2Third -#endif }; bool SkInterpolator::setKeyFrame(int index, SkMSec time, |