X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Floadcanvas.cpp;h=952899150aa15cc9cbab2a959b17cee31162e1d0;hb=e8ac1c4d98d6d600009fa7747cbaa0876d8a59ec;hp=9132bab14637908927dc20350d11d7a72d8620d9;hpb=67e4cb808328ea14df418d983e368f0eb4b742ae;p=synfig.git

diff --git a/synfig-core/trunk/src/synfig/loadcanvas.cpp b/synfig-core/trunk/src/synfig/loadcanvas.cpp
index 9132bab..9528991 100644
--- a/synfig-core/trunk/src/synfig/loadcanvas.cpp
+++ b/synfig-core/trunk/src/synfig/loadcanvas.cpp
@@ -346,7 +346,7 @@ CanvasParser::parse_color(xmlpp::Element *element,Canvas::Handle canvas)
 		return Color();
 	}
 
-	Color color;
+	Color color(0);
 
 	xmlpp::Element::NodeList list = element->get_children();
 	for(xmlpp::Element::NodeList::iterator iter = list.begin(); iter != list.end(); ++iter)
@@ -1042,31 +1042,6 @@ CanvasParser::parse_animated(xmlpp::Element *element,Canvas::Handle canvas)
 	return value_node;
 }
 
-// This function is a phase-out hack for the timed swap value node
-etl::handle<ValueNode_Animated>
-CanvasParser::parse_timedswap(xmlpp::Element *node,Canvas::Handle canvas)
-{
-	ValueNode_TimedSwap::Handle timed_swap(parse_linkable_value_node(node,canvas));
-
-	assert(timed_swap);
-
-	ValueNode_Animated::Handle animated(ValueNode_Animated::create(timed_swap->get_type()));
-
-	animated->set_root_canvas(canvas->get_root());
-
-	assert(animated);
-
-	Time swap_time, swap_length;
-	(*timed_swap->get_swap_time())(0).put(&swap_time);
-	(*timed_swap->get_swap_length())(0).put(&swap_length);
-
-	animated->new_waypoint(swap_time-swap_length,timed_swap->get_before());
-	animated->new_waypoint(swap_time,timed_swap->get_after());
-
-	return animated;
-}
-
-
 handle<ValueNode_Subtract>
 CanvasParser::parse_subtract(xmlpp::Element *element,Canvas::Handle canvas)
 {
@@ -1784,9 +1759,6 @@ CanvasParser::parse_value_node(xmlpp::Element *element,Canvas::Handle canvas)
 	if(element->get_name()=="bline") // This is not a typo. The dynamic list parser will parse a bline.
 		value_node=parse_dynamic_list(element,canvas);
 	else
-//	if(element->get_name()=="timed_swap")
-//		value_node=parse_timedswap(element,canvas);
-//	else
 	if(LinkableValueNode::book().count(element->get_name()))
 		value_node=parse_linkable_value_node(element,canvas);
 	else