projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Silence a couple of g++ 4.4 warnings in ETL make check
[synfig.git]
/
synfig-core
/
trunk
/
src
/
synfig
/
canvas.cpp
diff --git
a/synfig-core/trunk/src/synfig/canvas.cpp
b/synfig-core/trunk/src/synfig/canvas.cpp
index
67f06b9
..
2997ff4
100644
(file)
--- a/
synfig-core/trunk/src/synfig/canvas.cpp
+++ b/
synfig-core/trunk/src/synfig/canvas.cpp
@@
-47,7
+47,7
@@
using namespace synfig;
using namespace etl;
using namespace std;
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 ========================================================= */
/* === M A C R O S ========================================================= */
@@
-537,13
+537,14
@@
Canvas::surefind_canvas(const String &id)
external_canvas=externals_[file_name];
else
{
external_canvas=externals_[file_name];
else
{
+ String errors;
if(is_absolute_path(file_name))
if(is_absolute_path(file_name))
- external_canvas=open_canvas(file_name);
+ external_canvas=open_canvas(file_name
, errors
);
else
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)
if(!external_canvas)
- throw
Exception::FileNotFound(file_name
);
+ throw
runtime_error(errors
);
externals_[file_name]=external_canvas;
}
externals_[file_name]=external_canvas;
}
@@
-595,7
+596,8
@@
Canvas::find_canvas(const String &id)
Canvas::ConstHandle
Canvas::find_canvas(const String &id)const
{
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;
if(id.empty())
return this;
@@
-622,13
+624,14
@@
Canvas::find_canvas(const String &id)const
external_canvas=externals_[file_name];
else
{
external_canvas=externals_[file_name];
else
{
+ String errors;
if(is_absolute_path(file_name))
if(is_absolute_path(file_name))
- external_canvas=open_canvas(file_name);
+ external_canvas=open_canvas(file_name
, errors
);
else
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)
if(!external_canvas)
- throw
Exception::FileNotFound(file_name
);
+ throw
runtime_error(errors
);
externals_[file_name]=external_canvas;
}
externals_[file_name]=external_canvas;
}
@@
-652,7
+655,7
@@
Canvas::find_canvas(const String &id)const
// If the first character is the separator, then
// this references the root 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
return get_root()->find_canvas(string(id,1));
// Now we know that the requested Canvas is in a child