X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Fcanvas.cpp;h=4e9e3dd5082157bfbfb1473edcbc66046879a76a;hb=00644fdca1f213c58b42e7ec396bd29a0e4f5a02;hp=df200bafa3bb3b2aca5a858ca939e8c625a2245e;hpb=28f28705612902c15cd0702cc891fba35bf2d2df;p=synfig.git

diff --git a/synfig-core/trunk/src/synfig/canvas.cpp b/synfig-core/trunk/src/synfig/canvas.cpp
index df200ba..4e9e3dd 100644
--- a/synfig-core/trunk/src/synfig/canvas.cpp
+++ b/synfig-core/trunk/src/synfig/canvas.cpp
@@ -5,16 +5,17 @@
 **	$Id: canvas.cpp,v 1.1.1.1 2005/01/04 01:23:14 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
 */
 /* ========================================================================= */
@@ -512,6 +513,8 @@ Canvas::surefind_canvas(const String &id)
 		//! \todo This needs alot more optimization
 		String file_name(id,0,id.find_first_of('#'));
 		String external_id(id,id.find_first_of('#')+1);
+
+		file_name=unix_to_local_path(file_name);
 		
 		Canvas::Handle external_canvas;
 		
@@ -523,7 +526,7 @@ Canvas::surefind_canvas(const String &id)
 			if(is_absolute_path(file_name))
 				external_canvas=open_canvas(file_name);
 			else
-				external_canvas=open_canvas(get_file_path()+'/'+file_name);
+				external_canvas=open_canvas(get_file_path()+ETL_DIRECTORY_SEPERATOR+file_name);
 
 			if(!external_canvas)
 				throw Exception::FileNotFound(file_name);
@@ -596,6 +599,8 @@ Canvas::find_canvas(const String &id)const
 		String file_name(id,0,id.find_first_of('#'));
 		String external_id(id,id.find_first_of('#')+1);
 		
+		file_name=unix_to_local_path(file_name);
+		
 		Canvas::Handle external_canvas;
 		
 		// If the composition is already open, then use it.
@@ -606,7 +611,7 @@ Canvas::find_canvas(const String &id)const
 			if(is_absolute_path(file_name))
 				external_canvas=open_canvas(file_name);
 			else
-				external_canvas=open_canvas(get_file_path()+'/'+file_name);
+				external_canvas=open_canvas(get_file_path()+ETL_DIRECTORY_SEPERATOR+file_name);
 
 			if(!external_canvas)
 				throw Exception::FileNotFound(file_name);