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/SkScriptTokenizer.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/SkScriptTokenizer.cpp')
| -rw-r--r-- | src/animator/SkScriptTokenizer.cpp | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/animator/SkScriptTokenizer.cpp b/src/animator/SkScriptTokenizer.cpp index 42954a7706..24084453f6 100644 --- a/src/animator/SkScriptTokenizer.cpp +++ b/src/animator/SkScriptTokenizer.cpp @@ -1274,13 +1274,8 @@ bool SkScriptEngine2::ValueToString(const SkScriptValue2& value, SkString* strin #if defined(SK_SUPPORT_UNITTEST) #define testInt(expression) { #expression, SkOperand2::kS32, expression, 0, NULL } -#ifdef SK_SCALAR_IS_FLOAT #define testScalar(expression) { #expression, SkOperand2::kScalar, 0, (float) (expression), NULL } #define testRemainder(exp1, exp2) { #exp1 "%" #exp2, SkOperand2::kScalar, 0, fmodf((float) exp1, (float) exp2), NULL } -#else -#define testScalar(expression) { #expression, SkOperand2::kScalar, 0, (int) ((expression) * 65536.0f), NULL } -#define testRemainder(exp1, exp2) { #exp1 "%" #exp2, SkOperand2::kScalar, 0, (int) (fmod(exp1, exp2) * 65536.0f), NULL } -#endif #define testTrue(expression) { #expression, SkOperand2::kS32, 1, 0, NULL } #define testFalse(expression) { #expression, SkOperand2::kS32, 0, 0, NULL } |