projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't use a specialised parser for <composite> valuenodes - use the same as for all...
[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
bff17b0
..
c56986e
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 =========================================================== */
@@
-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;
}
@@
-287,9
+292,7
@@
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","halt");
break;
case INTERPOLATION_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");
+ waypoint_node->set_attribute("before","linear");
break;
case INTERPOLATION_MANUAL:
waypoint_node->set_attribute("before","manual");
break;
case INTERPOLATION_MANUAL:
waypoint_node->set_attribute("before","manual");
@@
-298,9
+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 (unless it's an angle - they default to linear)
- if (value_node->get_type() == ValueBase::TYPE_ANGLE)
- waypoint_node->set_attribute("before","auto");
+ waypoint_node->set_attribute("before","auto");
break;
default:
error("Unknown waypoint type for \"before\" attribute");
break;
default:
error("Unknown waypoint type for \"before\" attribute");
@@
-312,9
+313,7
@@
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","halt");
break;
case INTERPOLATION_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");
+ waypoint_node->set_attribute("after","linear");
break;
case INTERPOLATION_MANUAL:
waypoint_node->set_attribute("after","manual");
break;
case INTERPOLATION_MANUAL:
waypoint_node->set_attribute("after","manual");
@@
-323,9
+322,7
@@
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 (unless it's an angle - they default to linear)
- if (value_node->get_type() == ValueBase::TYPE_ANGLE)
- waypoint_node->set_attribute("after","auto");
+ waypoint_node->set_attribute("after","auto");
break;
default:
error("Unknown waypoint type for \"after\" attribute");
break;
default:
error("Unknown waypoint type for \"after\" attribute");
@@
-355,7
+352,7
@@
xmlpp::Element* encode_composite(xmlpp::Element* root,ValueNode_Composite::Const
int i;
for(i=0;i<value_node->link_count();i++)
{
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));
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));
@@
-639,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());
@@
-747,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);