projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added copyright lines for files I've edited this year.
[synfig.git]
/
synfig-core
/
trunk
/
src
/
synfig
/
loadcanvas.cpp
diff --git
a/synfig-core/trunk/src/synfig/loadcanvas.cpp
b/synfig-core/trunk/src/synfig/loadcanvas.cpp
index
b657776
..
200456e
100644
(file)
--- a/
synfig-core/trunk/src/synfig/loadcanvas.cpp
+++ b/
synfig-core/trunk/src/synfig/loadcanvas.cpp
@@
-6,7
+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
+** Copyright (c) 2007
, 2008
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
@@
-1073,6
+1073,7
@@
CanvasParser::parse_animated(xmlpp::Element *element,Canvas::Handle canvas)
if (first)
first = false;
else if (iter->get_value_node()->get_name() == "constant")
if (first)
first = false;
else if (iter->get_value_node()->get_name() == "constant")
+ {
if (angle - prev > 180)
{
while (angle - prev > 180) angle -= 360;
if (angle - prev > 180)
{
while (angle - prev > 180) angle -= 360;
@@
-1083,6
+1084,7
@@
CanvasParser::parse_animated(xmlpp::Element *element,Canvas::Handle canvas)
while (prev - angle > 180) angle += 360;
iter->set_value(Angle::deg(angle));
}
while (prev - angle > 180) angle += 360;
iter->set_value(Angle::deg(angle));
}
+ }
prev = angle;
}
}
prev = angle;
}
}
@@
-1692,7
+1694,9
@@
CanvasParser::parse_layer(xmlpp::Element *element,Canvas::Handle canvas)
String str= child->get_attribute("use")->get_value();
String str= child->get_attribute("use")->get_value();
- if(layer->get_param(param_name).get_type()==ValueBase::TYPE_CANVAS)
+ if (str.empty())
+ error(child,_("Empty use=\"\" value in <param>"));
+ else if(layer->get_param(param_name).get_type()==ValueBase::TYPE_CANVAS)
{
if(!layer->set_param(param_name,canvas->surefind_canvas(str)))
error((*iter),_("Layer rejected canvas link"));
{
if(!layer->set_param(param_name,canvas->surefind_canvas(str)))
error((*iter),_("Layer rejected canvas link"));