X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fmodules%2Fmod_imagemagick%2Ftrgt_imagemagick.cpp;h=f33b98f070d26b29ab1d3d7e86994a15c80ad7da;hb=ed2585fc1c1e49082c3d43b3999ef2bd963f2e86;hp=88dd95affbd48c923ccbea96ae79952afc269c93;hpb=f3851fac7d820c805f7b1756b1216383ec80390e;p=synfig.git diff --git a/synfig-core/trunk/src/modules/mod_imagemagick/trgt_imagemagick.cpp b/synfig-core/trunk/src/modules/mod_imagemagick/trgt_imagemagick.cpp index 88dd95a..f33b98f 100644 --- a/synfig-core/trunk/src/modules/mod_imagemagick/trgt_imagemagick.cpp +++ b/synfig-core/trunk/src/modules/mod_imagemagick/trgt_imagemagick.cpp @@ -36,6 +36,20 @@ #include #include "trgt_imagemagick.h" #include +#include +#if HAVE_SYS_WAIT_H + #include +#endif +#if HAVE_IO_H + #include +#endif +#if HAVE_PROCESS_H + #include +#endif +#if HAVE_FCNTL_H + #include +#endif +#include #include #include #include @@ -49,6 +63,12 @@ using namespace synfig; using namespace std; using namespace etl; +#if defined(HAVE_FORK) && defined(HAVE_PIPE) && defined(HAVE_WAITPID) + #define UNIX_PIPE_TO_PROCESSES +#elif defined(HAVE__SPAWNLP) && defined(HAVE__PIPE) && defined(HAVE_CWAIT) + #define WIN32_PIPE_TO_PROCESSES +#endif + /* === G L O B A L S ======================================================= */ SYNFIG_TARGET_INIT(imagemagick_trgt); @@ -61,6 +81,7 @@ SYNFIG_TARGET_SET_CVS_ID(imagemagick_trgt,"$Id$"); imagemagick_trgt::imagemagick_trgt(const char *Filename) { + pid=-1; file=NULL; filename=Filename; multi_image=false; @@ -70,8 +91,15 @@ imagemagick_trgt::imagemagick_trgt(const char *Filename) imagemagick_trgt::~imagemagick_trgt() { - if(file) - pclose(file); + if(file){ + fclose(file); + int status; +#if defined(WIN32_PIPE_TO_PROCESSES) + cwait(&status,pid,0); +#elif defined(UNIX_PIPE_TO_PROCESSES) + waitpid(pid,&status,0); +#endif + } file=NULL; delete [] buffer; delete [] color_buffer; @@ -110,7 +138,13 @@ imagemagick_trgt::end_frame() { fputc(0,file); fflush(file); - pclose(file); + fclose(file); + int status; +#if defined(WIN32_PIPE_TO_PROCESSES) + cwait(&status,pid,0); +#elif defined(UNIX_PIPE_TO_PROCESSES) + waitpid(pid,&status,0); +#endif } file=NULL; imagecount++; @@ -119,7 +153,8 @@ imagemagick_trgt::end_frame() bool imagemagick_trgt::start_frame(synfig::ProgressCallback *cb) { - string command; + const char *msg=_("Unable to open pipe to imagemagick's convert utility"); + string newfilename; if (multi_image) @@ -129,18 +164,126 @@ imagemagick_trgt::start_frame(synfig::ProgressCallback *cb) else newfilename = filename; - command=strprintf("convert -depth 8 -size %dx%d rgb%s:-[0] -density %dx%d \"%s\"\n", - desc.get_w(), desc.get_h(), // size - ((channels(pf) == 4) ? "a" : ""), // rgba or rgb? - round_to_int(desc.get_x_res()/39.3700787402), // density - round_to_int(desc.get_y_res()/39.3700787402), - newfilename.c_str()); +#if defined(WIN32_PIPE_TO_PROCESSES) + + int p[2]; + int stdin_fileno, stdout_fileno; + + if(_pipe(p, 512, O_BINARY | O_NOINHERIT) < 0) { + if(cb) cb->error(N_(msg)); + else synfig::error(N_(msg)); + return false; + } + + // Save stdin/stdout so we can restore them later + stdin_fileno = _dup(_fileno(stdin)); + stdout_fileno = _dup(_fileno(stdout)); + + // convert should read from the pipe + if(_dup2(p[0], _fileno(stdin)) != 0) { + if(cb) cb->error(N_(msg)); + else synfig::error(N_(msg)); + return false; + } + + /* + convert accepts the output filename on the command-line + if(_dup2(_fileno(output), _fileno(stdout)) != 0) { + if(cb) cb->error(N_(msg)); + else synfig::error(N_(msg)); + return false; + } + */ + + pid = _spawnlp(_P_NOWAIT, "convert", "convert", + "-depth", "8", + "-size", strprintf("%dx%d", desc.get_w(), desc.get_h()).c_str(), + ((channels(pf) == 4) ? "rgba:-[0]" : "rgb:-[0]"), + "-density", strprintf("%dx%d", round_to_int(desc.get_x_res()/39.3700787402), round_to_int(desc.get_y_res()/39.3700787402)).c_str(), + newfilename.c_str(), + (const char *)NULL); + + if( pid < 0) { + if(cb) cb->error(N_(msg)); + else synfig::error(N_(msg)); + return false; + } + + // Restore stdin/stdout + if(_dup2(stdin_fileno, _fileno(stdin)) != 0) { + if(cb) cb->error(N_(msg)); + else synfig::error(N_(msg)); + return false; + } + if(_dup2(stdout_fileno, _fileno(stdout)) != 0) { + if(cb) cb->error(N_(msg)); + else synfig::error(N_(msg)); + return false; + } + close(stdin_fileno); + close(stdout_fileno); + + // Close the pipe read end - convert uses it + close(p[0]); + + // We write data to the write end of the pipe + file = fdopen(p[1], "wb"); - file=popen(command.c_str(),POPEN_BINARY_WRITE_TYPE); +#elif defined(UNIX_PIPE_TO_PROCESSES) + + int p[2]; + + if (pipe(p)) { + if(cb) cb->error(N_(msg)); + else synfig::error(N_(msg)); + return false; + }; + + pid = fork(); + + if (pid == -1) { + if(cb) cb->error(N_(msg)); + else synfig::error(N_(msg)); + return false; + } + + if (pid == 0){ + // Child process + // Close pipeout, not needed + close(p[1]); + // Dup pipeout to stdin + if( dup2( p[0], STDIN_FILENO ) == -1 ){ + if(cb) cb->error(N_(msg)); + else synfig::error(N_(msg)); + return false; + } + // Close the unneeded pipeout + close(p[0]); + execlp("convert", "convert", + "-depth", "8", + "-size", strprintf("%dx%d", desc.get_w(), desc.get_h()).c_str(), + ((channels(pf) == 4) ? "rgba:-[0]" : "rgb:-[0]"), + "-density", strprintf("%dx%d", round_to_int(desc.get_x_res()/39.3700787402), round_to_int(desc.get_y_res()/39.3700787402)).c_str(), + newfilename.c_str(), + (const char *)NULL); + // We should never reach here unless the exec failed + if(cb) cb->error(N_(msg)); + else synfig::error(N_(msg)); + return false; + } else { + // Parent process + // Close pipein, not needed + close(p[0]); + // Save pipeout to file handle, will write to it later + file = fdopen(p[1], "wb"); + } + +#else + #error There are no known APIs for creating child processes +#endif if(!file) { - const char *msg=_("Unable to open pipe to imagemagick's convert utility"); if(cb)cb->error(N_(msg)); else synfig::error(N_(msg)); return false;