diff options
| author |  humper@google.com <humper@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-01-07 19:54:40 +0000 |
|---|---|---|
| committer | humper@google.com <humper@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-01-07 19:54:40 +0000 |
| commit | 0e51577a14f903ffeafa117a75954baeb173ffb9 (patch) | |
| tree | 3f3d849f3b6ec7778660f0da19f5d4175ba9f800 /src/animator/SkDisplayApply.cpp | |
| parent | af2bd7bdf593b3fc91bb1acffcc4a51bdb2f29ec (diff) | |
fix warning from scalar --> int32 conversion
BUG=
Review URL: https://codereview.appspot.com/7065050
git-svn-id: http://skia.googlecode.com/svn/trunk@7061 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/animator/SkDisplayApply.cpp')
| -rw-r--r-- | src/animator/SkDisplayApply.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/animator/SkDisplayApply.cpp b/src/animator/SkDisplayApply.cpp index baa10e7c3f..179641a22f 100644 --- a/src/animator/SkDisplayApply.cpp +++ b/src/animator/SkDisplayApply.cpp @@ -471,7 +471,7 @@ void SkApply::endSave(int index) { info->setValue(target, fActive->fSaveRestore[activeIndex], count); } else { SkScriptValue scriptValue; - bool success = target->getProperty(info->propertyIndex(), &scriptValue); + SkDEBUGCODE(bool success = ) target->getProperty(info->propertyIndex(), &scriptValue); SkASSERT(success == true); last[0] = scriptValue.fOperand; scriptValue.fOperand = fActive->fSaveRestore[activeIndex][0]; @@ -629,7 +629,7 @@ bool SkApply::interpolate(SkAnimateMaker& maker, SkMSec rawTime) { fLastTime = animate->dur; SkTypedArray formulaValues; formulaValues.setCount(count); - bool success = animate->fFieldInfo->setValue(maker, &formulaValues, 0, 0, NULL, + SkDEBUGCODE(bool success = ) animate->fFieldInfo->setValue(maker, &formulaValues, 0, 0, NULL, animate->getValuesType(), animate->formula); SkASSERT(success); if (restore) @@ -761,7 +761,7 @@ void SkApply::save(int index) { info->setValue(target, last.begin(), count); } else { SkScriptValue scriptValue; - bool success = target->getProperty(info->propertyIndex(), &scriptValue); + SkDEBUGCODE(bool success = ) target->getProperty(info->propertyIndex(), &scriptValue); SkASSERT(success == true); SkASSERT(scriptValue.fType == SkType_Float); fActive->fSaveRestore[activeIndex][0] = scriptValue.fOperand; |