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 ========================================================= */
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;
}
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;
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;
}
// 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