diff options
| author | Urban Müller | 2011-09-19 15:07:25 +0000 |
|---|---|---|
| committer | Urban Müller | 2011-09-19 15:07:25 +0000 |
| commit | dd3bb8dc7b173049f09969265e100e2e9f430946 (patch) | |
| tree | 91512befa806bdbd0f8e58693d1c873e467810f6 /it.class | |
| parent | 72096b370faba31a14097d45d45cd0b7414d55dc (diff) | |
| download | itools-dd3bb8dc7b173049f09969265e100e2e9f430946.tar.gz itools-dd3bb8dc7b173049f09969265e100e2e9f430946.tar.bz2 itools-dd3bb8dc7b173049f09969265e100e2e9f430946.zip | |
dont require ultratimeout
Diffstat (limited to 'it.class')
| -rw-r--r-- | it.class | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -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 === ""; } |