src/utils/SkInterpolator.cpp - Issue 117053002: remove SK_SCALAR_IS_[FLOAT,FIXED] and assume floats

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: src/utils/SkInterpolator.cpp

Issue 117053002: remove SK_SCALAR_IS_[FLOAT,FIXED] and assume floats (Closed) Base URL: https://skia.googlecode.com/svn/trunk

Patch Set: Created 7 years ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: src/utils/SkInterpolator.cpp

diff --git a/src/utils/SkInterpolator.cpp b/src/utils/SkInterpolator.cpp

index 2853b0703a6990f1b52c441483a916d629a7db28..595e46402da90e6d6800a4878805bb38b1db1444 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,