X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fmodules%2Fmod_imagemagick%2Ftrgt_imagemagick.cpp;fp=synfig-core%2Ftrunk%2Fsrc%2Fmodules%2Fmod_imagemagick%2Ftrgt_imagemagick.cpp;h=f33b98f070d26b29ab1d3d7e86994a15c80ad7da;hb=991d45b68d8b19c075e5b16bb63b6b8898090341;hp=bfd8f5975c1a82eaf8bade9279adcb4415a5dce7;hpb=3c78803c4023e7286d91f6de1cf727cd7bce854e;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 bfd8f59..f33b98f 100644
--- a/synfig-core/trunk/src/modules/mod_imagemagick/trgt_imagemagick.cpp
+++ b/synfig-core/trunk/src/modules/mod_imagemagick/trgt_imagemagick.cpp
@@ -37,7 +37,18 @@
 #include "trgt_imagemagick.h"
 #include <stdio.h>
 #include <sys/types.h>
-#include <sys/wait.h>
+#if HAVE_SYS_WAIT_H
+ #include <sys/wait.h>
+#endif
+#if HAVE_IO_H
+ #include <io.h>
+#endif
+#if HAVE_PROCESS_H
+ #include <process.h>
+#endif
+#if HAVE_FCNTL_H
+ #include <fcntl.h>
+#endif
 #include <unistd.h>
 #include <algorithm>
 #include <functional>
@@ -52,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);
@@ -77,7 +94,11 @@ imagemagick_trgt::~imagemagick_trgt()
 	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;
@@ -119,7 +140,11 @@ imagemagick_trgt::end_frame()
 		fflush(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++;
@@ -139,6 +164,73 @@ imagemagick_trgt::start_frame(synfig::ProgressCallback *cb)
 	else
 		newfilename = filename;
 
+#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");
+
+#elif defined(UNIX_PIPE_TO_PROCESSES)
+
 	int p[2];
   
 	if (pipe(p)) {
@@ -186,6 +278,10 @@ imagemagick_trgt::start_frame(synfig::ProgressCallback *cb)
 		file = fdopen(p[1], "wb");
 	}
 
+#else
+	#error There are no known APIs for creating child processes
+#endif
+
 	if(!file)
 	{
 		if(cb)cb->error(N_(msg));