X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fmodules%2Fmod_imagemagick%2Ftrgt_imagemagick.cpp;h=bfd8f5975c1a82eaf8bade9279adcb4415a5dce7;hb=9bb17dbd43d0988caab3a1fa420aa52a32e4fdc5;hp=610390aa2e872c3afa8d3c59e222e6b3d03ee3e4;hpb=5ddcf36f04cfbd10fabda4e3c5633cb27cdd4c0a;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 610390a..bfd8f59 100644
--- a/synfig-core/trunk/src/modules/mod_imagemagick/trgt_imagemagick.cpp
+++ b/synfig-core/trunk/src/modules/mod_imagemagick/trgt_imagemagick.cpp
@@ -1,7 +1,9 @@
-/*! ========================================================================
-** Synfig
-** ppm Target Module
-** $Id: trgt_imagemagick.cpp,v 1.1.1.1 2005/01/04 01:23:11 darco Exp $
+/* === S Y N F I G ========================================================= */
+/*!	\file trgt_imagemagick.cpp
+**	\brief ppm Target Module
+**
+**	\legal
+** $Id$
 **
 **	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
 **
@@ -14,6 +16,7 @@
 **	but WITHOUT ANY WARRANTY; without even the implied warranty of
 **	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 **	General Public License for more details.
+**	\endlegal
 **
 ** === N O T E S ===========================================================
 **
@@ -33,6 +36,9 @@
 #include <ETL/stringf>
 #include "trgt_imagemagick.h"
 #include <stdio.h>
+#include <sys/types.h>
+#include <sys/wait.h>
+#include <unistd.h>
 #include <algorithm>
 #include <functional>
 #include <ETL/clock>
@@ -52,12 +58,13 @@ SYNFIG_TARGET_INIT(imagemagick_trgt);
 SYNFIG_TARGET_SET_NAME(imagemagick_trgt,"imagemagick");
 SYNFIG_TARGET_SET_EXT(imagemagick_trgt,"miff");
 SYNFIG_TARGET_SET_VERSION(imagemagick_trgt,"0.1");
-SYNFIG_TARGET_SET_CVS_ID(imagemagick_trgt,"$Id: trgt_imagemagick.cpp,v 1.1.1.1 2005/01/04 01:23:11 darco Exp $");
+SYNFIG_TARGET_SET_CVS_ID(imagemagick_trgt,"$Id$");
 
 /* === M E T H O D S ======================================================= */
 
 imagemagick_trgt::imagemagick_trgt(const char *Filename)
 {
+	pid=-1;
 	file=NULL;
 	filename=Filename;
 	multi_image=false;
@@ -67,8 +74,11 @@ imagemagick_trgt::imagemagick_trgt(const char *Filename)
 
 imagemagick_trgt::~imagemagick_trgt()
 {
-	if(file)
-		pclose(file);
+	if(file){
+		fclose(file);
+		int status;
+		waitpid(pid,&status,0);
+	}
 	file=NULL;
 	delete [] buffer;
 	delete [] color_buffer;
@@ -77,8 +87,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;
@@ -108,26 +117,77 @@ imagemagick_trgt::end_frame()
 	{
 		fputc(0,file);
 		fflush(file);
-		pclose(file);
+		fclose(file);
+		int status;
+		waitpid(pid,&status,0);
 	}
 	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");
 
-	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());
+	string newfilename;
+
+	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;
 
-	file=popen(command.c_str(),"w");
+	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");
+	}
 
 	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;
@@ -139,7 +199,7 @@ imagemagick_trgt::start_frame(synfig::ProgressCallback *cb)
 }
 
 Color *
-imagemagick_trgt::start_scanline(int scanline)
+imagemagick_trgt::start_scanline(int /*scanline*/)
 {
 	return color_buffer;
 }