X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Fsavecanvas.cpp;h=299472ba2b63be87213e20b6da2c144e5af67633;hb=6fcfeb5b77c28b403b9fecc9bafcde6834447c9a;hp=5bfd6ec92ea3881f7607e34f8cc15f4fc4e92250;hpb=b134716b4429e5fd53f9d01fa3caae7ecc81f6d9;p=synfig.git

diff --git a/synfig-core/trunk/src/synfig/savecanvas.cpp b/synfig-core/trunk/src/synfig/savecanvas.cpp
index 5bfd6ec..299472b 100644
--- a/synfig-core/trunk/src/synfig/savecanvas.cpp
+++ b/synfig-core/trunk/src/synfig/savecanvas.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
@@ -57,6 +58,10 @@
 #include "gradient.h"
 #include <errno.h>
 
+extern "C" {
+#include <libxml/tree.h>
+}
+
 #endif
 
 /* === U S I N G =========================================================== */
@@ -96,7 +101,7 @@ xmlpp::Element* encode_real(xmlpp::Element* root,Real v)
 	return root;
 }
 
-xmlpp::Element* encode_time(xmlpp::Element* root,Time t, float fps=0)
+xmlpp::Element* encode_time(xmlpp::Element* root,Time t, float /*fps*/=0)
 {
 	root->set_name("time");
  	//root->set_attribute("value",t.get_string(fps));
@@ -243,7 +248,7 @@ xmlpp::Element* encode_value(xmlpp::Element* root,const ValueBase &data,Canvas::
 		root->set_name("nil");
 		return root;
 	default:
-		synfig::error(strprintf("Unknown value(%s), cannot create XML representation!",ValueBase::type_name(data.get_type()).c_str()));
+		synfig::error(strprintf(_("Unknown value(%s), cannot create XML representation!"),ValueBase::type_local_name(data.get_type()).c_str()));
 		root->set_name("nil");
 		return root;
 	}
@@ -268,8 +273,18 @@ xmlpp::Element* encode_animated(xmlpp::Element* root,ValueNode_Animated::ConstHa
 		//waypoint_node->add_child(encode_value(iter->get_value(),canvas));
 		if(iter->get_value_node()->is_exported())
 			waypoint_node->set_attribute("use",iter->get_value_node()->get_relative_id(canvas));
-		else
-			encode_value_node(waypoint_node->add_child("value_node"),iter->get_value_node(),canvas);
+		else {
+			ValueNode::ConstHandle value_node = iter->get_value_node();
+			if(ValueNode_Const::ConstHandle::cast_dynamic(value_node)) {
+				const ValueBase data = ValueNode_Const::ConstHandle::cast_dynamic(value_node)->get_value();
+				if (data.get_type() == ValueBase::TYPE_CANVAS)
+					waypoint_node->set_attribute("use",data.get(Canvas::Handle()).get()->get_relative_id(canvas));
+				else
+					encode_value_node(waypoint_node->add_child("value_node"),iter->get_value_node(),canvas);
+			}
+			else
+				encode_value_node(waypoint_node->add_child("value_node"),iter->get_value_node(),canvas);
+		}
 
 		switch(iter->get_before())
 		{
@@ -286,7 +301,7 @@ xmlpp::Element* encode_animated(xmlpp::Element* root,ValueNode_Animated::ConstHa
 			waypoint_node->set_attribute("before","constant");
 			break;
 		case INTERPOLATION_TCB:
-			// This is the default value, so don't add a new attribute
+			waypoint_node->set_attribute("before","auto");
 			break;
 		default:
 			error("Unknown waypoint type for \"before\" attribute");
@@ -307,10 +322,10 @@ xmlpp::Element* encode_animated(xmlpp::Element* root,ValueNode_Animated::ConstHa
 			waypoint_node->set_attribute("after","constant");
 			break;
 		case INTERPOLATION_TCB:
-			// This is the default value, so don't add a new attribute
+			waypoint_node->set_attribute("after","auto");
 			break;
 		default:
-			error("Unknown waypoint type for \"before\" attribute");
+			error("Unknown waypoint type for \"after\" attribute");
 		}
 
 		if(iter->get_tension()!=0.0)
@@ -337,7 +352,7 @@ xmlpp::Element* encode_composite(xmlpp::Element* root,ValueNode_Composite::Const
 	int i;
 	for(i=0;i<value_node->link_count();i++)
 	{
-		string name(strprintf("c%d",i+1));
+		string name(value_node->link_name(i));
 		assert(value_node->get_link(i));
 		if(value_node->get_link(i)->is_exported())
 			root->set_attribute(name,value_node->get_link(i)->get_relative_id(canvas));
@@ -583,16 +598,25 @@ xmlpp::Element* encode_layer(xmlpp::Element* root,Layer::ConstHandle layer)
 				continue;
 			}
 
-			if(value.get_type()==ValueBase::TYPE_CANVAS && !value.get(Canvas::LooseHandle())->is_inline())
+			if(value.get_type()==ValueBase::TYPE_CANVAS)
 			{
-				Canvas::Handle child(value.get(Canvas::LooseHandle()));
+				// the ->is_inline() below was crashing if the canvas
+				// contained a PasteCanvas with the default <No Image
+				// Selected> Canvas setting;  this avoids the crash
+				if (!value.get(Canvas::LooseHandle()))
+					continue;
+
+				if (!value.get(Canvas::LooseHandle())->is_inline())
+				{
+					Canvas::Handle child(value.get(Canvas::LooseHandle()));
 
-				if(!value.get(Canvas::Handle()))
+					if(!value.get(Canvas::Handle()))
+						continue;
+					xmlpp::Element *node=root->add_child("param");
+					node->set_attribute("name",iter->get_name());
+					node->set_attribute("use",child->get_relative_id(layer->get_canvas()));
 					continue;
-				xmlpp::Element *node=root->add_child("param");
-				node->set_attribute("name",iter->get_name());
-				node->set_attribute("use",child->get_relative_id(layer->get_canvas()));
-				continue;
+				}
 			}
 			xmlpp::Element *node=root->add_child("param");
 			node->set_attribute("name",iter->get_name());
@@ -612,7 +636,7 @@ xmlpp::Element* encode_canvas(xmlpp::Element* root,Canvas::ConstHandle canvas)
 	root->set_name("canvas");
 
 	if(canvas->is_root())
-		root->set_attribute("version","0.1");
+		root->set_attribute("version",canvas->get_version());
 
 	if(!canvas->get_id().empty() && !canvas->is_root() && !canvas->is_inline())
 		root->set_attribute("id",canvas->get_id());
@@ -681,7 +705,8 @@ xmlpp::Element* encode_canvas(xmlpp::Element* root,Canvas::ConstHandle canvas)
 	}
 
 	// Output the <defs> section
-	if(!canvas->is_inline() && !canvas->value_node_list().empty() || !canvas->children().empty())
+	//! \todo check where the parentheses should really go - around the && or the ||?
+	if((!canvas->is_inline() && !canvas->value_node_list().empty()) || !canvas->children().empty())
 	{
 		xmlpp::Element *node=root->add_child("defs");
 		const ValueNodeList &value_node_list(canvas->value_node_list());
@@ -720,6 +745,11 @@ synfig::save_canvas(const String &filename, Canvas::ConstHandle canvas)
 
 	synfig::String tmp_filename(filename+".TMP");
 
+	if (filename_extension(filename) == ".sifz")
+		xmlSetCompressMode(9);
+	else
+		xmlSetCompressMode(0);
+
 	try
 	{
 		assert(canvas);