X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Fcanvas.cpp;h=2997ff4b358f593eca972ba71b996fd80b8ea912;hb=a89329256a2c4b3ef585922d2aea6d94f7e125b8;hp=fcf8935b63facd8c8b2e388afe360b2cde4ad5c9;hpb=36956f8ebab84ea17b75d3f06b3fd509d8fc79ff;p=synfig.git

diff --git a/synfig-core/trunk/src/synfig/canvas.cpp b/synfig-core/trunk/src/synfig/canvas.cpp
index fcf8935..2997ff4 100644
--- a/synfig-core/trunk/src/synfig/canvas.cpp
+++ b/synfig-core/trunk/src/synfig/canvas.cpp
@@ -6,7 +6,7 @@
 **
 **	\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
@@ -47,7 +47,7 @@ using namespace synfig;
 using namespace etl;
 using namespace std;
 
-namespace synfig { extern Canvas::Handle open_canvas(const String &filename); };
+namespace synfig { extern Canvas::Handle open_canvas(const String &filename, String &errors); };
 
 /* === M A C R O S ========================================================= */
 
@@ -90,6 +90,26 @@ Canvas::on_changed()
 
 Canvas::~Canvas()
 {
+	// we were having a crash where pastecanvas layers were still
+	// refering to a canvas after it had been destroyed;  this code
+	// will stop the pastecanvas layers from refering to the canvas
+	// before the canvas is destroyed
+
+	// the set_sub_canvas(0) ends up deleting the parent-child link,
+	// which deletes the current element from the set we're iterating
+	// through, so we have to make sure we've incremented the iterator
+	// before we mess with the pastecanvas
+	std::set<Node*>::iterator iter = parent_set.begin();
+	while (iter != parent_set.end())
+	{
+		Layer_PasteCanvas* paste_canvas = dynamic_cast<Layer_PasteCanvas*>(*iter);
+		iter++;
+		if(paste_canvas)
+			paste_canvas->set_sub_canvas(0);
+		else
+			warning("destroyed canvas has a parent that is not a pastecanvas - please report if repeatable");
+	}
+
 	//if(is_inline() && parent_) assert(0);
 	_CanvasCounter::counter--;
 	clear();
@@ -349,7 +369,6 @@ Canvas::_get_relative_id(etl::loose_handle<const Canvas> x)const
 	return id;
 }
 
-
 ValueNode::Handle
 Canvas::find_value_node(const String &id)
 {
@@ -487,7 +506,6 @@ Canvas::remove_value_node(ValueNode::Handle x)
 	x->set_id("");
 }
 
-
 etl::handle<Canvas>
 Canvas::surefind_canvas(const String &id)
 {
@@ -519,13 +537,14 @@ Canvas::surefind_canvas(const String &id)
 			external_canvas=externals_[file_name];
 		else
 		{
+			String errors;
 			if(is_absolute_path(file_name))
-				external_canvas=open_canvas(file_name);
+				external_canvas=open_canvas(file_name, errors);
 			else
-				external_canvas=open_canvas(get_file_path()+ETL_DIRECTORY_SEPARATOR+file_name);
+				external_canvas=open_canvas(get_file_path()+ETL_DIRECTORY_SEPARATOR+file_name, errors);
 
 			if(!external_canvas)
-				throw Exception::FileNotFound(file_name);
+				throw runtime_error(errors);
 			externals_[file_name]=external_canvas;
 		}
 
@@ -577,7 +596,8 @@ Canvas::find_canvas(const String &id)
 Canvas::ConstHandle
 Canvas::find_canvas(const String &id)const
 {
-	if(is_inline() && parent_)return parent_->find_canvas(id);
+	if(is_inline() && parent_)
+		return parent_->find_canvas(id);
 
 	if(id.empty())
 		return this;
@@ -604,13 +624,14 @@ Canvas::find_canvas(const String &id)const
 			external_canvas=externals_[file_name];
 		else
 		{
+			String errors;
 			if(is_absolute_path(file_name))
-				external_canvas=open_canvas(file_name);
+				external_canvas=open_canvas(file_name, errors);
 			else
-				external_canvas=open_canvas(get_file_path()+ETL_DIRECTORY_SEPARATOR+file_name);
+				external_canvas=open_canvas(get_file_path()+ETL_DIRECTORY_SEPARATOR+file_name, errors);
 
 			if(!external_canvas)
-				throw Exception::FileNotFound(file_name);
+				throw runtime_error(errors);
 			externals_[file_name]=external_canvas;
 		}
 
@@ -634,7 +655,7 @@ Canvas::find_canvas(const String &id)const
 
 	// If the first character is the separator, then
 	// this references the root canvas.
-	if(id.find_first_of(':')==0)
+	if(id[0]==':')
 		return get_root()->find_canvas(string(id,1));
 
 	// Now we know that the requested Canvas is in a child
@@ -648,7 +669,6 @@ Canvas::find_canvas(const String &id)const
 	return child_canvas->find_canvas(string(id,id.find_first_of(':')+1));
 }
 
-
 Canvas::Handle
 Canvas::create()
 {
@@ -686,10 +706,8 @@ Canvas::insert(iterator iter,etl::handle<Layer> x)
 
 	x->set_canvas(this);
 
-
 	add_child(x.get());
 
-
 	LooseHandle correct_canvas(this);
 	//while(correct_canvas->is_inline())correct_canvas=correct_canvas->parent();
 	Layer::LooseHandle loose_layer(x);
@@ -711,11 +729,9 @@ Canvas::insert(iterator iter,etl::handle<Layer> x)
 								   &Canvas::remove_group_pair),
 							   loose_layer))));
 
-
 	if(!x->get_group().empty())
 		add_group_pair(x->get_group(),x);
 
-
 	changed();
 }
 
@@ -775,6 +791,7 @@ Canvas::clone(const GUID& deriv_guid)const
 		// it was failing to ascertain the absolute pathname of the imported image, since it needs the pathname
 		// of the canvas to get that, which is stored in the parent canvas
 		canvas->parent_=parent();
+		canvas->rend_desc() = rend_desc();
 		//canvas->set_inline(parent());
 	}
 
@@ -966,7 +983,6 @@ Canvas::get_file_path()const
 	return dirname(file_name_);
 }
 
-
 String
 Canvas::get_meta_data(const String& key)const
 {