projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added my "Copyright (c) 2007" notices, for files I edited in 2007.
[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
4bcf1f8
..
ebc3569
100644
(file)
--- a/
synfig-core/trunk/src/modules/mod_imagemagick/mptr_imagemagick.cpp
+++ b/
synfig-core/trunk/src/modules/mod_imagemagick/mptr_imagemagick.cpp
@@
-6,6
+6,7
@@
**
** \legal
** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
**
** \legal
** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+** Copyright (c) 2007 Chris Moore
**
** This package is free software; you can redistribute it and/or
** modify it under the terms of the GNU General Public License as
**
** This package is free software; you can redistribute it and/or
** modify it under the terms of the GNU General Public License as
@@
-63,7
+64,7
@@
using namespace etl;
#if defined(HAVE_FORK) && defined(HAVE_PIPE) && defined(HAVE_WAITPID)
#define UNIX_PIPE_TO_PROCESSES
#if defined(HAVE_FORK) && defined(HAVE_PIPE) && defined(HAVE_WAITPID)
#define UNIX_PIPE_TO_PROCESSES
-#el
if defined(HAVE__SPAWNLP) && defined(HAVE__PIPE) && defined(HAVE_CWAIT)
+#el
se
#define WIN32_PIPE_TO_PROCESSES
#endif
#define WIN32_PIPE_TO_PROCESSES
#endif
@@
-104,17
+105,26
@@
imagemagick_mptr::get_frame(synfig::Surface &surface,Time /*time*/, synfig::Prog
return false;
}
string temp_file="/tmp/deleteme.png";
return false;
}
string temp_file="/tmp/deleteme.png";
- string output="png32:"+temp_file;
#if defined(WIN32_PIPE_TO_PROCESSES)
#if defined(WIN32_PIPE_TO_PROCESSES)
+ if(file)
+ pclose(file);
+
+ string command;
+
if(filename.find("psd")!=String::npos)
if(filename.find("psd")!=String::npos)
-
_spawnlp(_P_WAIT, "convert", "convert", filename.c_str(), "-flatten", output.c_str(), (const char *)NULL
);
+
command=strprintf("convert \"%s\" -flatten \"png32:%s\"\n",filename.c_str(),temp_file.c_str()
);
else
else
- _spawnlp(_P_WAIT, "convert", "convert", filename.c_str(), output.c_str(), (const char *)NULL);
+ command=strprintf("convert \"%s\" \"png32:%s\"\n",filename.c_str(),temp_file.c_str());
+
+ if(system(command.c_str())!=0)
+ return false;
#elif defined(UNIX_PIPE_TO_PROCESSES)
#elif defined(UNIX_PIPE_TO_PROCESSES)
+ string output="png32:"+temp_file;
+
pid_t pid = fork();
if (pid == -1) {
pid_t pid = fork();
if (pid == -1) {