X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Fvaluenode_linear.cpp;h=b017c9a28c3df83d82eb1e7dbeed7479da876174;hb=75a589f5db5821fc10dd67941e4ca587b32a69d0;hp=f0d6c1198a1d52255b72d52d9d14b086e440362d;hpb=37600b4b217caa5e316984ec0b035c5e8f9698af;p=synfig.git diff --git a/synfig-core/trunk/src/synfig/valuenode_linear.cpp b/synfig-core/trunk/src/synfig/valuenode_linear.cpp index f0d6c11..b017c9a 100644 --- a/synfig-core/trunk/src/synfig/valuenode_linear.cpp +++ b/synfig-core/trunk/src/synfig/valuenode_linear.cpp @@ -34,6 +34,7 @@ #include "valuenode_const.h" #include "general.h" #include "color.h" +#include #endif @@ -114,11 +115,7 @@ ValueNode_Linear::operator()(Time t)const case ValueBase::TYPE_COLOR: return (*m_)(t).get( Color())*t+(*b_)(t).get( Color()); case ValueBase::TYPE_INTEGER: - { - Real ret = (*m_)(t).get(int())*t+(*b_)(t).get(int()) + 0.5f; - if (ret < 0) return static_cast(ret-1); - return static_cast(ret); - } + return round_to_int((*m_)(t).get(int())*t+(*b_)(t).get(int())); case ValueBase::TYPE_REAL: return (*m_)(t).get( Real())*t+(*b_)(t).get( Real()); case ValueBase::TYPE_TIME: