projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix some compiler warnings.
[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
1d82f05
..
5bb3ec0
100644
(file)
--- a/
synfig-studio/trunk/src/synfigapp/canvasinterface.h
+++ b/
synfig-studio/trunk/src/synfigapp/canvasinterface.h
@@
-256,7
+256,7
@@
public:
Mode get_mode()const;
//! Creates a new layer, of type \c id at the top of the layer stack
Mode get_mode()const;
//! Creates a new layer, of type \c id at the top of the layer stack
- synfig::Layer::Handle add_layer(synfig::String id) { return add_layer_to(id,get_canvas()); }
+
//
synfig::Layer::Handle add_layer(synfig::String id) { return add_layer_to(id,get_canvas()); }
synfig::Layer::Handle add_layer_to(synfig::String id,synfig::Canvas::Handle canvas, int depth=0);
synfig::Layer::Handle add_layer_to(synfig::String id,synfig::Canvas::Handle canvas, int depth=0);
@@
-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 copy
=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);