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 the optimization of using STRAIGHT blends instead of COMPOSITE when SYNFIG_...
[synfig.git]
/
synfig-core
/
trunk
/
src
/
synfig
/
valuenode_dynamiclist.cpp
diff --git
a/synfig-core/trunk/src/synfig/valuenode_dynamiclist.cpp
b/synfig-core/trunk/src/synfig/valuenode_dynamiclist.cpp
index
88e82cb
..
a0d3f79
100644
(file)
--- a/
synfig-core/trunk/src/synfig/valuenode_dynamiclist.cpp
+++ b/
synfig-core/trunk/src/synfig/valuenode_dynamiclist.cpp
@@
-1,8
+1,8
@@
/* === S Y N F I G ========================================================= */
/*! \file valuenode_dynamiclist.cpp
/* === S Y N F I G ========================================================= */
/*! \file valuenode_dynamiclist.cpp
-** \brief
Template File
+** \brief
Implementation of the "Dynamic List" valuenode conversion.
**
**
-** $Id
: valuenode_dynamiclist.cpp,v 1.1.1.1 2005/01/04 01:23:15 darco Exp
$
+** $Id$
**
** \legal
** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
**
** \legal
** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
@@
-405,7
+405,7
@@
ValueNode_DynamicList::ListEntry::status_at_time(const Time &t)const
ActivepointList::const_iterator prev_iter;
bool state(true);
ActivepointList::const_iterator prev_iter;
bool state(true);
- // New "symetric" state mechanism
+ // New "sym
m
etric" state mechanism
if(!timing_info.empty())
{
if(timing_info.size()==1)
if(!timing_info.empty())
{
if(timing_info.size()==1)
@@
-621,6
+621,7
@@
bool
ValueNode_DynamicList::set_link_vfunc(int i,ValueNode::Handle x)
{
assert(i>=0);
ValueNode_DynamicList::set_link_vfunc(int i,ValueNode::Handle x)
{
assert(i>=0);
+
if((unsigned)i>=list.size())
return false;
if(x->get_type()!=container_type)
if((unsigned)i>=list.size())
return false;
if(x->get_type()!=container_type)
@@
-633,6
+634,7
@@
ValueNode::LooseHandle
ValueNode_DynamicList::get_link_vfunc(int i)const
{
assert(i>=0);
ValueNode_DynamicList::get_link_vfunc(int i)const
{
assert(i>=0);
+
if((unsigned)i>=list.size())
return 0;
return list[i].value_node;
if((unsigned)i>=list.size())
return 0;
return list[i].value_node;
@@
-647,7
+649,8
@@
ValueNode_DynamicList::link_count()const
String
ValueNode_DynamicList::link_local_name(int i)const
{
String
ValueNode_DynamicList::link_local_name(int i)const
{
- assert(i>=0 && (unsigned)i<list.size());
+ assert(i>=0 && i<link_count());
+
return etl::strprintf(_("Item %03d"),i+1);
}
return etl::strprintf(_("Item %03d"),i+1);
}
@@
-719,6
+722,7
@@
LinkableValueNode*
ValueNode_DynamicList::create_new()const
{
assert(0);
ValueNode_DynamicList::create_new()const
{
assert(0);
+
return 0;
}
return 0;
}