**
** \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
#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)
+#else
#define WIN32_PIPE_TO_PROCESSES
#endif
return false;
}
string temp_file="/tmp/deleteme.png";
- string output="png32:"+temp_file;
#if defined(WIN32_PIPE_TO_PROCESSES)
+ if(file)
+ pclose(file);
+
+ string command;
+
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
- _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)
+ string output="png32:"+temp_file;
+
pid_t pid = fork();
if (pid == -1) {
Importer::Handle importer(Importer::open(temp_file));
- DEBUGPOINT();
-
if(!importer)
{
if(cb)cb->error(_("Unable to open ")+temp_file);
return false;
}
- DEBUGPOINT();
-
if(!importer->get_frame(surface,0,cb))
{
if(cb)cb->error(_("Unable to get frame from ")+temp_file);
Surface bleh(surface);
surface=bleh;
-
//remove(temp_file.c_str());
- DEBUGPOINT();
return true;
#else