projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'genete_static_values'
[synfig.git]
/
synfig-core
/
src
/
modules
/
mod_imagemagick
/
mptr_imagemagick.cpp
diff --git
a/synfig-core/src/modules/mod_imagemagick/mptr_imagemagick.cpp
b/synfig-core/src/modules/mod_imagemagick/mptr_imagemagick.cpp
index
2860c1f
..
d1c6428
100644
(file)
--- a/
synfig-core/src/modules/mod_imagemagick/mptr_imagemagick.cpp
+++ b/
synfig-core/src/modules/mod_imagemagick/mptr_imagemagick.cpp
@@
-93,7
+93,7
@@
imagemagick_mptr::~imagemagick_mptr()
}
bool
}
bool
-imagemagick_mptr::get_frame(synfig::Surface &surface,Time /*time*/, synfig::ProgressCallback *cb)
+imagemagick_mptr::get_frame(synfig::Surface &surface,
const synfig::RendDesc &renddesc,
Time /*time*/, synfig::ProgressCallback *cb)
{
//#define HAS_LIBPNG 1
{
//#define HAS_LIBPNG 1
@@
-159,7
+159,7
@@
imagemagick_mptr::get_frame(synfig::Surface &surface,Time /*time*/, synfig::Prog
return false;
}
return false;
}
- if(!importer->get_frame(surface,0,cb))
+ if(!importer->get_frame(surface,
renddesc,
0,cb))
{
if(cb)cb->error(_("Unable to get frame from ")+temp_file);
else synfig::error(_("Unable to get frame from ")+temp_file);
{
if(cb)cb->error(_("Unable to get frame from ")+temp_file);
else synfig::error(_("Unable to get frame from ")+temp_file);