X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Fsavecanvas.cpp;h=8ccb099373b3ccf58adf5fc29228e2878d0349a2;hb=c732f2078f9ed4393bff0e761beab709e49b6c4c;hp=690277cf630f1af91daeac96aab832d038cf19f8;hpb=c3ad95144d148602f672e95ddda1f18fc35502f8;p=synfig.git

diff --git a/synfig-core/trunk/src/synfig/savecanvas.cpp b/synfig-core/trunk/src/synfig/savecanvas.cpp
index 690277c..8ccb099 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 =========================================================== */
@@ -287,7 +292,9 @@ xmlpp::Element* encode_animated(xmlpp::Element* root,ValueNode_Animated::ConstHa
 			waypoint_node->set_attribute("before","halt");
 			break;
 		case INTERPOLATION_LINEAR:
-			waypoint_node->set_attribute("before","linear");
+			// This is the default value for angles, so don't add a new attribute for them
+			if (value_node->get_type() != ValueBase::TYPE_ANGLE)
+				waypoint_node->set_attribute("before","linear");
 			break;
 		case INTERPOLATION_MANUAL:
 			waypoint_node->set_attribute("before","manual");
@@ -296,7 +303,9 @@ 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
+			// This is the default value, so don't add a new attribute (unless it's an angle - they default to linear)
+			if (value_node->get_type() == ValueBase::TYPE_ANGLE)
+				waypoint_node->set_attribute("before","auto");
 			break;
 		default:
 			error("Unknown waypoint type for \"before\" attribute");
@@ -308,7 +317,9 @@ xmlpp::Element* encode_animated(xmlpp::Element* root,ValueNode_Animated::ConstHa
 			waypoint_node->set_attribute("after","halt");
 			break;
 		case INTERPOLATION_LINEAR:
-			waypoint_node->set_attribute("after","linear");
+			// This is the default value for angles, so don't add a new attribute for them
+			if (value_node->get_type() != ValueBase::TYPE_ANGLE)
+				waypoint_node->set_attribute("after","linear");
 			break;
 		case INTERPOLATION_MANUAL:
 			waypoint_node->set_attribute("after","manual");
@@ -317,10 +328,12 @@ 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
+			// This is the default value, so don't add a new attribute (unless it's an angle - they default to linear)
+			if (value_node->get_type() == ValueBase::TYPE_ANGLE)
+				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)
@@ -739,6 +752,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);