X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Floadcanvas.h;h=888e1d70077a0e8fd3cb634f488ca20d9375e97e;hb=9459638ad6797b8139f1e9f0715c96076dbf0890;hp=bf5f053aa7bbb7534e7929b6ea6ffbf5dd8950b7;hpb=fed432fb09efa7eaecf220c494feb4f3b59b922c;p=synfig.git

diff --git a/synfig-core/trunk/src/synfig/loadcanvas.h b/synfig-core/trunk/src/synfig/loadcanvas.h
index bf5f053..888e1d7 100644
--- a/synfig-core/trunk/src/synfig/loadcanvas.h
+++ b/synfig-core/trunk/src/synfig/loadcanvas.h
@@ -7,6 +7,7 @@
 **	\legal
 **	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
 **	Copyright (c) 2007, 2008 Chris Moore
+**	Copyright (c) 2009 Carlos A. Sosa Navarro
 **
 **	This package is free software; you can redistribute it and/or
 **	modify it under the terms of the GNU General Public License as
@@ -121,8 +122,13 @@ public:
 
 	static void register_canvas_in_map(Canvas::Handle canvas, String as);
 
+#ifdef _DEBUG
+	static void show_canvas_map(String file, int line, String text);
+#endif	// _DEBUG
+
 	//! \todo writeme
 	Canvas::Handle parse_from_file_as(const String &filename,const String &as,String &errors);
+	Canvas::Handle parse_as(xmlpp::Element* node,String &errors);
 
 	static std::set<String> loading_;
 
@@ -174,6 +180,7 @@ private:
 
 //!	Loads a canvas from \a filename
 /*!	\return	The Canvas's handle on success, an empty handle on failure */
+extern Canvas::Handle open_canvas(xmlpp::Element* node,String &errors,String &warnings);
 extern Canvas::Handle open_canvas(const String &filename,String &errors,String &warnings);
 extern Canvas::Handle open_canvas_as(const String &filename,const String &as,String &errors,String &warnings);