diff options
author | Christian Schneider | 2015-09-07 18:08:53 +0200 |
---|---|---|
committer | Christian Schneider | 2015-09-07 18:08:53 +0200 |
commit | 1d1e1f54a9d465ccf6db0317abfb96a7b8828f50 (patch) | |
tree | 936dc6fc781afac1c2629f86e1d1758bd89ddf9d /it.class | |
parent | 1c0a580ec4de036530b08a83d5ddc2d915bdfd0b (diff) | |
parent | 6a64e44bf81efcda494d4b2a7b147a25f552039b (diff) | |
download | itools-1d1e1f54a9d465ccf6db0317abfb96a7b8828f50.tar.gz itools-1d1e1f54a9d465ccf6db0317abfb96a7b8828f50.tar.bz2 itools-1d1e1f54a9d465ccf6db0317abfb96a7b8828f50.zip |
Merge branch 'master' into cs/php7
Diffstat (limited to 'it.class')
-rw-r--r-- | it.class | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -690,7 +690,7 @@ static function imageconvert($p) $ultratimeout = file_exists("/opt/ultra/bin/ultratimeout") ? "/opt/ultra/bin/ultratimeout 30 " : ""; if (in_array($type, explode(',', $p['types']))) # Valid type? - $cmdoutput = it::exec($ultratimeout . 'gm convert 2>&1 {-opts} {in} {type}:{out} || echo "SHELL ERROR $?"', $p); + $cmdoutput = it::exec('( ' . $ultratimeout . 'gm convert 2>&1 {-opts} {in} {type}:{out} || echo "SHELL ERROR $?" ) | grep -v "iCCP: known incorrect sRGB profile"', $p); return $cmdoutput === ""; } |