projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add Layer::get_param_local_name() to allow us to report the local name of layer param...
[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
cb47847
..
645895c
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
**
** \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
**
** 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>
#include "gradient.h"
#include <errno.h>
+extern "C" {
+#include <libxml/tree.h>
+}
+
#endif
/* === U S I N G =========================================================== */
#endif
/* === U S I N G =========================================================== */
@@
-96,7
+101,7
@@
xmlpp::Element* encode_real(xmlpp::Element* root,Real v)
return root;
}
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));
{
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:
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;
}
root->set_name("nil");
return root;
}
@@
-296,7
+301,7
@@
xmlpp::Element* encode_animated(xmlpp::Element* root,ValueNode_Animated::ConstHa
waypoint_node->set_attribute("before","constant");
break;
case INTERPOLATION_TCB:
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");
break;
default:
error("Unknown waypoint type for \"before\" attribute");
@@
-317,10
+322,10
@@
xmlpp::Element* encode_animated(xmlpp::Element* root,ValueNode_Animated::ConstHa
waypoint_node->set_attribute("after","constant");
break;
case INTERPOLATION_TCB:
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:
break;
default:
- error("Unknown waypoint type for \"
before
\" attribute");
+ error("Unknown waypoint type for \"
after
\" attribute");
}
if(iter->get_tension()!=0.0)
}
if(iter->get_tension()!=0.0)
@@
-631,7
+636,7
@@
xmlpp::Element* encode_canvas(xmlpp::Element* root,Canvas::ConstHandle canvas)
root->set_name("canvas");
if(canvas->is_root())
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());
if(!canvas->get_id().empty() && !canvas->is_root() && !canvas->is_inline())
root->set_attribute("id",canvas->get_id());
@@
-739,6
+744,11
@@
synfig::save_canvas(const String &filename, Canvas::ConstHandle canvas)
synfig::String tmp_filename(filename+".TMP");
synfig::String tmp_filename(filename+".TMP");
+ if (filename_extension(filename) == ".sifz")
+ xmlSetCompressMode(9);
+ else
+ xmlSetCompressMode(0);
+
try
{
assert(canvas);
try
{
assert(canvas);