X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Fvaluenode_linear.cpp;h=01e67a2da0db11717b6ab606df1ccc98225d7b8f;hb=792ed706efeef84c5b82abf982078daad15f5d6c;hp=df8205798cee0fb300dc09b68143eb8cfcd432f7;hpb=24a04c6ee533b747f8ff6b128c86c6a01f390a88;p=synfig.git

diff --git a/synfig-core/trunk/src/synfig/valuenode_linear.cpp b/synfig-core/trunk/src/synfig/valuenode_linear.cpp
index df82057..01e67a2 100644
--- a/synfig-core/trunk/src/synfig/valuenode_linear.cpp
+++ b/synfig-core/trunk/src/synfig/valuenode_linear.cpp
@@ -1,11 +1,12 @@
 /* === S Y N F I G ========================================================= */
 /*!	\file valuenode_linear.cpp
-**	\brief Template File
+**	\brief Implementation of the "Linear" valuenode conversion.
 **
 **	$Id$
 **
 **	\legal
 **	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**	Copyright (c) 2007 Chris Moore
 **
 **	This package is free software; you can redistribute it and/or
 **	modify it under the terms of the GNU General Public License as
@@ -33,6 +34,7 @@
 #include "valuenode_const.h"
 #include "general.h"
 #include "color.h"
+#include <ETL/misc>
 
 #endif
 
@@ -86,6 +88,12 @@ ValueNode_Linear::ValueNode_Linear(const ValueBase &value):
 	DCAST_HACK_ENABLE();
 }
 
+LinkableValueNode*
+ValueNode_Linear::create_new()const
+{
+	return new ValueNode_Linear(get_type());
+}
+
 ValueNode_Linear*
 ValueNode_Linear::create(const ValueBase &x)
 {
@@ -107,7 +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:
-		return static_cast<int>((*m_)(t).get(int())*t+(*b_)(t).get(int()) + 0.5f);
+		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:
@@ -219,9 +227,3 @@ ValueNode_Linear::get_link_index_from_name(const String &name)const
 
 	throw Exception::BadLinkName(name);
 }
-
-LinkableValueNode*
-ValueNode_Linear::create_new()const
-{
-	return new ValueNode_Linear(get_type());
-}