diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-12-04 20:07:47 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-12-04 20:07:47 +0000 |
| commit | c84728d72a47415929464c5cf062300d86a91246 (patch) | |
| tree | f58b4fe50ae82e23fee49e879e8490ef2957f617 /src/animator | |
| parent | a0b266d8170211d9f2a6f90ba9c889f0c1b6d1b6 (diff) | |
Changed maxInputCount for exact inputCount
Processing still had issue when the number of inputs was 0, so I changed my previous fix from a maximum input count to an exact input count. -1 is used when the input count isn't fixed (but still has to be a non-negative number).
BUG=
R=senorblanco@chromium.org, reed@google.com, sugoi@google.com, bsalomon@google.com
Author: sugoi@chromium.org
Review URL: https://codereview.chromium.org/100803004
git-svn-id: http://skia.googlecode.com/svn/trunk@12492 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/animator')
| -rw-r--r-- | src/animator/SkScript.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/animator/SkScript.cpp b/src/animator/SkScript.cpp index c74b195f3a..934b0abe1a 100644 --- a/src/animator/SkScript.cpp +++ b/src/animator/SkScript.cpp @@ -1532,11 +1532,11 @@ bool SkScriptEngine::ConvertTo(SkScriptEngine* engine, SkDisplayTypes toType, Sk SkString* strPtr = new SkString(); SkASSERT(engine); engine->track(strPtr); - if (type == SkType_Int) + if (type == SkType_Int) { strPtr->appendS32(operand.fS32); - else if (type == SkType_Displayable) + } else if (type == SkType_Displayable) { SkASSERT(0); // must call through instance version instead of static version - else { + } else { if (type != SkType_Float) { success = false; break; |