Made all the assert() lines which check the valuenode sub-parameter index range the...

[synfig.git] / synfig-core / trunk / src / synfig / valuenode_twotone.cpp

diff --git a/synfig-core/trunk/src/synfig/valuenode_twotone.cpp b/synfig-core/trunk/src/synfig/valuenode_twotone.cpp
index cc05838..497af2e 100644 (file)
--- a/synfig-core/trunk/src/synfig/valuenode_twotone.cpp
+++ b/synfig-core/trunk/src/synfig/valuenode_twotone.cpp
@@ -1,8 +1,8 @@
 /* === S Y N F I G ========================================================= */
-/*!    \file valuenode_subtract.cpp
-**     \brief Template File
+/*!    \file valuenode_twotone.cpp
+**     \brief Implementation of the "Two-Tone" valuenode conversion.
 **
-**     $Id: valuenode_twotone.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
@@ -72,13 +72,13 @@ ValueNode_TwoTone::create(const ValueBase& x)
        if(id!=ValueBase::TYPE_GRADIENT)
        {
                assert(0);
-               throw runtime_error("synfig::ValueNode_TwoTone:Bad type "+ValueBase::type_name(id));                    
-       }               
+               throw runtime_error("synfig::ValueNode_TwoTone:Bad type "+ValueBase::type_name(id));
+       }
 
        ValueNode_TwoTone* value_node=new ValueNode_TwoTone();
 
        assert(value_node->get_type()==id);
-       
+
        return value_node;
 }
 
@@ -116,7 +116,8 @@ synfig::ValueNode_TwoTone::operator()(Time t)const
 bool
 ValueNode_TwoTone::set_link_vfunc(int i,ValueNode::Handle x)
 {
-       assert(i>=0 && i<3);
+       assert(i>=0 && i<link_count());
+
        switch(i)
        {
                case 0:
@@ -133,7 +134,8 @@ ValueNode_TwoTone::set_link_vfunc(int i,ValueNode::Handle x)
 ValueNode::LooseHandle
 ValueNode_TwoTone::get_link_vfunc(int i)const
 {
-       assert(i>=0 && i<3);
+       assert(i>=0 && i<link_count());
+
        switch(i)
        {
                case 0:
@@ -153,30 +155,34 @@ ValueNode_TwoTone::link_count()const
 String
 ValueNode_TwoTone::link_local_name(int i)const
 {
-       assert(i>=0 && i<2);
+       assert(i>=0 && i<link_count());
+
        switch(i)
        {
                case 0:
                        return _("Color1");
                case 1:
                        return _("Color2");
+               default:
+                       return String();
        }
-       return String();
-}      
+}
 
 String
 ValueNode_TwoTone::link_name(int i)const
 {
-       assert(i>=0 && i<2);
+       assert(i>=0 && i<link_count());
+
        switch(i)
        {
                case 0:
                        return "color1";
                case 1:
                        return "color2";
+               default:
+                       return String();
        }
-       return String();
-}      
+}
 
 int
 ValueNode_TwoTone::get_link_index_from_name(const String &name)const