summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUrban Müller2011-09-19 15:07:25 +0000
committerUrban Müller2011-09-19 15:07:25 +0000
commitdd3bb8dc7b173049f09969265e100e2e9f430946 (patch)
tree91512befa806bdbd0f8e58693d1c873e467810f6
parent72096b370faba31a14097d45d45cd0b7414d55dc (diff)
downloaditools-dd3bb8dc7b173049f09969265e100e2e9f430946.tar.gz
itools-dd3bb8dc7b173049f09969265e100e2e9f430946.tar.bz2
itools-dd3bb8dc7b173049f09969265e100e2e9f430946.zip
dont require ultratimeout
-rw-r--r--it.class3
1 files changed, 2 insertions, 1 deletions
diff --git a/it.class b/it.class
index 82d01cc..b01285e 100644
--- a/it.class
+++ b/it.class
@@ -562,9 +562,10 @@ static function imageconvert($p)
$type = strtr($type, array("jpeg" => "jpg", "tiff" => "tif", "ps" => "eps", "ept" => "eps"));
$p += array('type' => $type, 'types' => "bmp,eps,gif,jp2,jpg,png,svg,tif");
$p['-opts'] = array('-thumbnail' => $p['size']) + (array)$p['-opts'];
+ $ultratimeout = file_exists("/opt/ultra/bin/ultratimeout") ? "/opt/ultra/bin/ultratimeout 600 " : "";
if (in_array($type, explode(',', $p['types']))) # Valid type?
- $cmdoutput = it::exec('ultratimeout 600 gm convert 2>&1 -flatten -quality 75 {-opts} {in} {type}:{out} || echo "SHELL ERROR $?"', $p);
+ $cmdoutput = it::exec($ultratimeout . 'gm convert 2>&1 -flatten -quality 75 {-opts} {in} {type}:{out} || echo "SHELL ERROR $?"', $p);
return $cmdoutput === "";
}