X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Fvaluenode_add.cpp;h=9f83229fa27574cd098880fdadc8884484210c46;hb=c732f2078f9ed4393bff0e761beab709e49b6c4c;hp=3c08cef418338123cd219296650281987526630b;hpb=fc340a19f9ca4ceaa46d60230206ac6ed7c050e3;p=synfig.git

diff --git a/synfig-core/trunk/src/synfig/valuenode_add.cpp b/synfig-core/trunk/src/synfig/valuenode_add.cpp
index 3c08cef..9f83229 100644
--- a/synfig-core/trunk/src/synfig/valuenode_add.cpp
+++ b/synfig-core/trunk/src/synfig/valuenode_add.cpp
@@ -6,6 +6,7 @@
 **
 **	\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
@@ -37,6 +38,7 @@
 #include "vector.h"
 #include "angle.h"
 #include "real.h"
+#include <ETL/misc>
 
 #endif
 
@@ -172,11 +174,7 @@ synfig::ValueNode_Add::operator()(Time t)const
 	case ValueBase::TYPE_COLOR:
 		return ((*ref_a)(t).get(Color())+(*ref_b)(t).get(Color()))*(*scalar)(t).get(Real());
 	case ValueBase::TYPE_INTEGER:
-	{
-		Real ret = ((*ref_a)(t).get(int())+(*ref_b)(t).get(int()))*(*scalar)(t).get(Real()) + 0.5f;
-		if (ret < 0) return static_cast<int>(ret-1);
-		return static_cast<int>(ret); 
-	}
+		return round_to_int(((*ref_a)(t).get(int())+(*ref_b)(t).get(int()))*(*scalar)(t).get(Real()));
 	case ValueBase::TYPE_REAL:
 		return ((*ref_a)(t).get(Vector::value_type())+(*ref_b)(t).get(Vector::value_type()))*(*scalar)(t).get(Real());
 	case ValueBase::TYPE_TIME:
@@ -259,7 +257,6 @@ ValueNode_Add::link_name(int i)const
 int
 ValueNode_Add::get_link_index_from_name(const String &name)const
 {
-	printf("%s:%d link_index_from_name\n", __FILE__, __LINE__);
 	if(name=="lhs") return 0;
 	if(name=="rhs") return 1;
 	if(name=="scalar") return 2;