X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Floadcanvas.cpp;h=8cf5cba0b13797fb8ffc8286e522fbcf6c191aa5;hb=b054a4463e94169b6d119191000b8485cf7fa853;hp=60a30eee4714b2fe84948485f715f891be73921f;hpb=01bed3975630929d007f82a8de05674ad1c21bf3;p=synfig.git

diff --git a/synfig-core/trunk/src/synfig/loadcanvas.cpp b/synfig-core/trunk/src/synfig/loadcanvas.cpp
index 60a30ee..8cf5cba 100644
--- a/synfig-core/trunk/src/synfig/loadcanvas.cpp
+++ b/synfig-core/trunk/src/synfig/loadcanvas.cpp
@@ -6,7 +6,7 @@
 **
 **	\legal
 **	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
-**	Copyright (c) 2007 Chris Moore
+**	Copyright (c) 2007, 2008 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
@@ -1062,11 +1062,7 @@ CanvasParser::parse_animated(xmlpp::Element *element,Canvas::Handle canvas)
 	// waypoint's value
 	if (type == ValueBase::TYPE_ANGLE) 
 	{
-		Canvas::Handle parent = canvas;
-		while (!parent->is_root())
-			parent = parent->parent();
-
-		if (parent->get_version() == "0.1")
+		if (canvas->get_version() == "0.1")
 		{
 			bool first = true;
 			Real angle, prev = 0;
@@ -1077,6 +1073,7 @@ CanvasParser::parse_animated(xmlpp::Element *element,Canvas::Handle canvas)
 				if (first)
 					first = false;
 				else if (iter->get_value_node()->get_name() == "constant")
+				{
 					if (angle - prev > 180)
 					{
 						while (angle - prev > 180) angle -= 360;
@@ -1087,6 +1084,7 @@ CanvasParser::parse_animated(xmlpp::Element *element,Canvas::Handle canvas)
 						while (prev - angle > 180) angle += 360;
 						iter->set_value(Angle::deg(angle));
 					}
+				}
 				prev = angle;
 			}
 		}
@@ -1277,12 +1275,23 @@ CanvasParser::parse_linkable_value_node(xmlpp::Element *element,Canvas::Handle c
 		}
 	}
 
+	String version(canvas->get_version());
 	for (int i = 0; i < value_node->link_count(); i++)
 	{
-		if (!c[i] &&
-			// the 'width' parameter of <stripes> wasn't always present, so it won't be in old .sif files
-			!(element->get_name() == "stripes" && value_node->link_name(i) == "width"))
+		if (!c[i])
 		{
+			// the 'width' parameter of <stripes> wasn't always present in version 0.1 canvases
+			if (version == "0.1" && element->get_name() == "stripes" && value_node->link_name(i) == "width")
+				continue;
+
+			// these 3 blinecalctangent parameters didn't appear until canvas version 0.5
+			if ((version == "0.1" || version == "0.2" || version == "0.3" || version == "0.4") &&
+				element->get_name() == "blinecalctangent" &&
+				(value_node->link_name(i) == "offset" ||
+				 value_node->link_name(i) == "scale" ||
+				 value_node->link_name(i) == "fixed_length"))
+				continue;
+
 			error(element, strprintf(_("<%s> is missing link %d (%s)"),
 									 element->get_name().c_str(),
 									 i,
@@ -1291,6 +1300,18 @@ CanvasParser::parse_linkable_value_node(xmlpp::Element *element,Canvas::Handle c
 		}
 	}
 
+	// pre 0.4 canvases had *calctangent outputs scaled down by 0.5 for some reason
+	if (element->get_name() == "blinecalctangent" || element->get_name() == "segcalctangent")
+	{
+		if (version == "0.1" || version == "0.2" || version == "0.3")
+		{
+			handle<LinkableValueNode> scale_value_node=LinkableValueNode::create("scale",type);
+			scale_value_node->set_link(scale_value_node->get_link_index_from_name("link"), value_node);
+			scale_value_node->set_link(scale_value_node->get_link_index_from_name("scalar"), ValueNode_Const::create(Real(0.5)));
+			value_node = scale_value_node;
+		}
+	}
+
 	return value_node;
 }
 
@@ -1696,7 +1717,9 @@ CanvasParser::parse_layer(xmlpp::Element *element,Canvas::Handle canvas)
 
 				String str=	child->get_attribute("use")->get_value();
 
-				if(layer->get_param(param_name).get_type()==ValueBase::TYPE_CANVAS)
+				if (str.empty())
+					error(child,_("Empty use=\"\" value in <param>"));
+				else if(layer->get_param(param_name).get_type()==ValueBase::TYPE_CANVAS)
 				{
 					if(!layer->set_param(param_name,canvas->surefind_canvas(str)))
 						error((*iter),_("Layer rejected canvas link"));