projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Made all the assert() lines which check the valuenode sub-parameter index range the...
[synfig.git]
/
synfig-core
/
trunk
/
src
/
synfig
/
valuenode_radialcomposite.cpp
diff --git
a/synfig-core/trunk/src/synfig/valuenode_radialcomposite.cpp
b/synfig-core/trunk/src/synfig/valuenode_radialcomposite.cpp
index
8e2356f
..
6ab24e4
100644
(file)
--- a/
synfig-core/trunk/src/synfig/valuenode_radialcomposite.cpp
+++ b/
synfig-core/trunk/src/synfig/valuenode_radialcomposite.cpp
@@
-1,6
+1,6
@@
/* === S Y N F I G ========================================================= */
/*! \file valuenode_radialcomposite.cpp
/* === S Y N F I G ========================================================= */
/*! \file valuenode_radialcomposite.cpp
-** \brief
Template File
+** \brief
Implementation of the "Radial Composite" valuenode conversion.
**
** $Id$
**
**
** $Id$
**
@@
-141,8
+141,7
@@
ValueNode_RadialComposite::link_count()const
bool
ValueNode_RadialComposite::set_link_vfunc(int i,ValueNode::Handle x)
{
bool
ValueNode_RadialComposite::set_link_vfunc(int i,ValueNode::Handle x)
{
- assert(i>=0);
- assert(i<6);
+ assert(i>=0 && i<link_count());
if(PlaceholderValueNode::Handle::cast_dynamic(x))
{
if(PlaceholderValueNode::Handle::cast_dynamic(x))
{
@@
-153,7
+152,6
@@
ValueNode_RadialComposite::set_link_vfunc(int i,ValueNode::Handle x)
switch(get_type())
{
case ValueBase::TYPE_VECTOR:
switch(get_type())
{
case ValueBase::TYPE_VECTOR:
- assert(i<2);
if(i==0 && x->get_type()!=ValueBase::TYPE_REAL)
return false;
if(i==1 && x->get_type()!=ValueBase::TYPE_ANGLE)
if(i==0 && x->get_type()!=ValueBase::TYPE_REAL)
return false;
if(i==1 && x->get_type()!=ValueBase::TYPE_ANGLE)
@@
-163,7
+161,6
@@
ValueNode_RadialComposite::set_link_vfunc(int i,ValueNode::Handle x)
break;
case ValueBase::TYPE_COLOR:
break;
case ValueBase::TYPE_COLOR:
- assert(i<4);
if((i==0 || i==1 || i==3) && x->get_type()!=ValueBase::TYPE_REAL)
return false;
if((i==2) && x->get_type()!=ValueBase::TYPE_ANGLE)
if((i==0 || i==1 || i==3) && x->get_type()!=ValueBase::TYPE_REAL)
return false;
if((i==2) && x->get_type()!=ValueBase::TYPE_ANGLE)
@@
-182,14
+179,16
@@
ValueNode_RadialComposite::set_link_vfunc(int i,ValueNode::Handle x)
ValueNode::LooseHandle
ValueNode_RadialComposite::get_link_vfunc(int i)const
{
ValueNode::LooseHandle
ValueNode_RadialComposite::get_link_vfunc(int i)const
{
- assert(i>=0 && i<6);
+ assert(i>=0 && i<link_count());
+
return components[i];
}
String
ValueNode_RadialComposite::link_local_name(int i)const
{
return components[i];
}
String
ValueNode_RadialComposite::link_local_name(int i)const
{
- assert(i>=0 && i<6);
+ assert(i>=0 && i<link_count());
+
switch(get_type())
{
case ValueBase::TYPE_VECTOR:
switch(get_type())
{
case ValueBase::TYPE_VECTOR:
@@
-221,7
+220,8
@@
ValueNode_RadialComposite::link_local_name(int i)const
String
ValueNode_RadialComposite::link_name(int i)const
{
String
ValueNode_RadialComposite::link_name(int i)const
{
- assert(i>=0 && i<5);
+ assert(i>=0 && i<link_count());
+
return strprintf("c%d",i);
}
return strprintf("c%d",i);
}