X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fsynfigapp%2Fcanvasinterface.cpp;h=13e5871120041b6cc1eb9eb5d92c81c312b9803e;hb=16993383da963eacb529bfdb7ded2a2de3173eea;hp=ca4c651be68e6c733a6da49a4bc67c51f6402788;hpb=c9582dc1cba08b936b35f36f36c0fa018a203a53;p=synfig.git diff --git a/synfig-studio/trunk/src/synfigapp/canvasinterface.cpp b/synfig-studio/trunk/src/synfigapp/canvasinterface.cpp index ca4c651..13e5871 100644 --- a/synfig-studio/trunk/src/synfigapp/canvasinterface.cpp +++ b/synfig-studio/trunk/src/synfigapp/canvasinterface.cpp @@ -560,7 +560,7 @@ CanvasInterface::jump_to_prev_keyframe() } bool -CanvasInterface::import(const synfig::String &filename, bool resize_image) +CanvasInterface::import(const synfig::String &filename, synfig::String &errors, synfig::String &warnings, bool resize_image) { Action::PassiveGrouper group(get_instance().get(),_("Import Image")); @@ -579,8 +579,7 @@ CanvasInterface::import(const synfig::String &filename, bool resize_image) // If this is a SIF file, then we need to do things slightly differently if(ext=="sif" || ext=="sifz")try { - String errors; - Canvas::Handle outside_canvas(synfig::open_canvas(filename, errors)); + Canvas::Handle outside_canvas(synfig::open_canvas(filename, errors, warnings)); if(!outside_canvas) throw String(_("Unable to open this composition")) + ":\n\n" + errors;