projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use American spelling of 'initialise'.
[synfig.git]
/
synfig-core
/
trunk
/
src
/
modules
/
mod_imagemagick
/
mptr_imagemagick.cpp
diff --git
a/synfig-core/trunk/src/modules/mod_imagemagick/mptr_imagemagick.cpp
b/synfig-core/trunk/src/modules/mod_imagemagick/mptr_imagemagick.cpp
index
bd577ac
..
a077230
100644
(file)
--- a/
synfig-core/trunk/src/modules/mod_imagemagick/mptr_imagemagick.cpp
+++ b/
synfig-core/trunk/src/modules/mod_imagemagick/mptr_imagemagick.cpp
@@
-72,7
+72,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,Time
/*time*/
, synfig::ProgressCallback *cb)
{
//#define HAS_LIBPNG 1
{
//#define HAS_LIBPNG 1
@@
-173,7
+173,7
@@
imagemagick_mptr::get_frame(synfig::Surface &surface,Time time, synfig::Progress
command=strprintf("convert \"%s\" -flatten ppm:-\n",filename.c_str());
command=strprintf("convert \"%s\" -flatten ppm:-\n",filename.c_str());
- file=popen(command.c_str(),
"r"
);
+ file=popen(command.c_str(),
POPEN_BINARY_READ_TYPE
);
if(!file)
{
if(!file)
{