X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fmodules%2Fmod_imagemagick%2Ftrgt_imagemagick.cpp;h=32dd839f4647235b66c0bf51a22cdac43d1b46a4;hb=4ba22fb51d97f1ecce04dcc5e40569a4354c1bae;hp=0d0cdffd77baff70fa124ce4e6b0a316391119b6;hpb=c3ad95144d148602f672e95ddda1f18fc35502f8;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 0d0cdff..32dd839 100644 --- a/synfig-core/trunk/src/modules/mod_imagemagick/trgt_imagemagick.cpp +++ b/synfig-core/trunk/src/modules/mod_imagemagick/trgt_imagemagick.cpp @@ -6,6 +6,7 @@ ** $Id$ ** ** 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 @@ -36,6 +37,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 +64,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 +#else + #define WIN32_PIPE_TO_PROCESSES +#endif + /* === G L O B A L S ======================================================= */ SYNFIG_TARGET_INIT(imagemagick_trgt); @@ -61,6 +82,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 +92,15 @@ imagemagick_trgt::imagemagick_trgt(const char *Filename) imagemagick_trgt::~imagemagick_trgt() { - if(file) + if(file){ +#if defined(WIN32_PIPE_TO_PROCESSES) pclose(file); +#elif defined(UNIX_PIPE_TO_PROCESSES) + fclose(file); + int status; + waitpid(pid,&status,0); +#endif + } file=NULL; delete [] buffer; delete [] color_buffer; @@ -80,8 +109,7 @@ imagemagick_trgt::~imagemagick_trgt() bool imagemagick_trgt::set_rend_desc(RendDesc *given_desc) { - String ext(find(filename.begin(),filename.end(),'.')+1,filename.end()); - if(ext=="xpm") + if(filename_extension(filename) == ".xpm") pf=PF_RGB; else pf=PF_RGB|PF_A; @@ -111,26 +139,100 @@ imagemagick_trgt::end_frame() { fputc(0,file); fflush(file); +#if defined(WIN32_PIPE_TO_PROCESSES) pclose(file); +#elif defined(UNIX_PIPE_TO_PROCESSES) + fclose(file); + int status; + waitpid(pid,&status,0); +#endif } file=NULL; + imagecount++; } 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(channels(pf)==4) - command=strprintf("convert -depth 8 -size %dx%d rgba:-[0] -density %dx%d \"%s\"\n",desc.get_w(),desc.get_h(),round_to_int(desc.get_x_res()/39.3700787402),round_to_int(desc.get_y_res()/39.3700787402),filename.c_str()); + if (multi_image) + newfilename = (filename_sans_extension(filename) + + etl::strprintf(".%04d",imagecount) + + filename_extension(filename)); else - command=strprintf("convert -depth 8 -size %dx%d rgb:-[0] -density %dx%d \"%s\"\n",desc.get_w(),desc.get_h(),round_to_int(desc.get_x_res()/39.3700787402),round_to_int(desc.get_y_res()/39.3700787402),filename.c_str()); + newfilename = filename; + +#if defined(WIN32_PIPE_TO_PROCESSES) + + string command; + + 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()); - file=popen(command.c_str(),"w"); + 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;