Add my copyright to files I've modified.

[synfig.git] / synfig-core / trunk / src / synfig / savecanvas.cpp

diff --git a/synfig-core/trunk/src/synfig/savecanvas.cpp b/synfig-core/trunk/src/synfig/savecanvas.cpp
index 6129f71..4f37a25 100644 (file)
--- 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));
@@ -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())
                {
@@ -277,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");
@@ -286,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");
@@ -298,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");
@@ -307,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)
@@ -729,6 +752,11 @@ synfig::save_canvas(const String &filename, Canvas::ConstHandle canvas)
 
        synfig::String tmp_filename(filename+".TMP");
 
+       if (String(filename.begin() + filename.find_last_of('.')+1, filename.end()) == "sifz")
+               xmlSetCompressMode(9);
+       else
+               xmlSetCompressMode(0);
+
        try
        {
                assert(canvas);