X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Fvaluenode_scale.cpp;h=ffe90d6459635c372b0620b08b456fd58486fcaa;hb=c3e45b84cbe115d9a8d216f1ce99d06fdd49ccca;hp=b2f62b79b0fe4e116a14b9b577eaeb70f6a7b019;hpb=37600b4b217caa5e316984ec0b035c5e8f9698af;p=synfig.git diff --git a/synfig-core/trunk/src/synfig/valuenode_scale.cpp b/synfig-core/trunk/src/synfig/valuenode_scale.cpp index b2f62b7..ffe90d6 100644 --- a/synfig-core/trunk/src/synfig/valuenode_scale.cpp +++ b/synfig-core/trunk/src/synfig/valuenode_scale.cpp @@ -1,6 +1,6 @@ /* === S Y N F I G ========================================================= */ /*! \file valuenode_scale.cpp -** \brief Template File +** \brief Implementation of the "Scale" valuenode conversion. ** ** $Id$ ** @@ -39,6 +39,7 @@ #include "vector.h" #include "time.h" #include "angle.h" +#include #endif @@ -176,11 +177,7 @@ synfig::ValueNode_Scale::operator()(Time t)const return ret; } else if(get_type()==ValueBase::TYPE_INTEGER) - { - Real ret = (*value_node)(t).get(int())*(*scalar)(t).get(Real()) + 0.5f; - if (ret < 0) return static_cast(ret-1); - return static_cast(ret); - } + return round_to_int((*value_node)(t).get(int())*(*scalar)(t).get(Real())); else if(get_type()==ValueBase::TYPE_REAL) return (*value_node)(t).get(Real())*(*scalar)(t).get(Real()); else if(get_type()==ValueBase::TYPE_TIME)