Apply 1659126: fix Win32 icon generation with png2ico. Patch by Dmitriy Pomerantsev...

[synfig.git] / synfig-studio / trunk / src / synfigapp / canvasinterface.cpp

diff --git a/synfig-studio/trunk/src/synfigapp/canvasinterface.cpp b/synfig-studio/trunk/src/synfigapp/canvasinterface.cpp
index 6d7e61a..e89fff7 100644 (file)
--- a/synfig-studio/trunk/src/synfigapp/canvasinterface.cpp
+++ b/synfig-studio/trunk/src/synfigapp/canvasinterface.cpp
@@ -5,16 +5,17 @@
 **     $Id: canvasinterface.cpp,v 1.1.1.1 2005/01/07 03:34:37 darco Exp $
 **
 **     \legal
-**     Copyright (c) 2002 Robert B. Quattlebaum Jr.
+**     Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
 **
-**     This software and associated documentation
-**     are CONFIDENTIAL and PROPRIETARY property of
-**     the above-mentioned copyright holder.
+**     This package is free software; you can redistribute it and/or
+**     modify it under the terms of the GNU General Public License as
+**     published by the Free Software Foundation; either version 2 of
+**     the License, or (at your option) any later version.
 **
-**     You may not copy, print, publish, or in any
-**     other way distribute this software without
-**     a prior written agreement with
-**     the copyright holder.
+**     This package is distributed in the hope that it will be useful,
+**     but WITHOUT ANY WARRANTY; without even the implied warranty of
+**     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+**     General Public License for more details.
 **     \endlegal
 */
 /* ========================================================================= */
@@ -747,13 +748,13 @@ _process_value_desc(const synfigapp::ValueDesc& value_desc,std::vector<synfigapp
                                ret++;
                        }
                        // Process the linkable ValueNode's children
-                       LinkableValueNode::Handle value_node(LinkableValueNode::Handle::cast_dynamic(value_node));
+                       LinkableValueNode::Handle value_node_copy(LinkableValueNode::Handle::cast_dynamic(value_node));
                        int i;
-                       for(i=0;i<value_node->link_count();i++)
+                       for(i=0;i<value_node_copy->link_count();i++)
                        {
-                               ValueNode::Handle link(value_node->get_link(i));
+                               ValueNode::Handle link(value_node_copy->get_link(i));
                                if(!link->is_exported())
-                                       ret+=_process_value_desc(ValueDesc(value_node,i),out,guid_set);
+                                       ret+=_process_value_desc(ValueDesc(value_node_copy,i),out,guid_set);
                        }
                }
                else if(ValueNode_Animated::Handle::cast_dynamic(value_node))