projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'akagogo_svg' into genete_master
[synfig.git]
/
synfig-studio
/
trunk
/
src
/
synfigapp
/
canvasinterface.h
diff --git
a/synfig-studio/trunk/src/synfigapp/canvasinterface.h
b/synfig-studio/trunk/src/synfigapp/canvasinterface.h
index
ba4dbb3
..
5bb3ec0
100644
(file)
--- a/
synfig-studio/trunk/src/synfigapp/canvasinterface.h
+++ b/
synfig-studio/trunk/src/synfigapp/canvasinterface.h
@@
-271,7
+271,7
@@
public:
void set_rend_desc(const synfig::RendDesc &rend_desc);
void set_rend_desc(const synfig::RendDesc &rend_desc);
- bool import(const synfig::String &filename, bool resize_image=false);
+ bool import(const synfig::String &filename,
synfig::String &errors, synfig::String &warnings,
bool resize_image=false);
void waypoint_duplicate(synfigapp::ValueDesc value_desc,synfig::Waypoint waypoint);
void waypoint_duplicate(synfigapp::ValueDesc value_desc,synfig::Waypoint waypoint);