diff options
| author | Christian Schneider | 2015-09-10 16:08:27 +0200 |
|---|---|---|
| committer | Christian Schneider | 2015-09-10 16:08:27 +0200 |
| commit | a3628fc906934b20757907699680150242a9cb0d (patch) | |
| tree | e0c980bb6a0c7e4b83d1ecfb84c6f68970d1352b /it.class | |
| parent | 1d1e1f54a9d465ccf6db0317abfb96a7b8828f50 (diff) | |
| parent | 1406935f2fb3ccd7608ae19e92187a936e6129b0 (diff) | |
| download | itools-a3628fc906934b20757907699680150242a9cb0d.tar.gz itools-a3628fc906934b20757907699680150242a9cb0d.tar.bz2 itools-a3628fc906934b20757907699680150242a9cb0d.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 $?" ) | grep -v "iCCP: known incorrect sRGB profile"', $p); + $cmdoutput = it::exec('( ' . $ultratimeout . 'gm convert 2>&1 {-opts} {in} {type}:{out} || echo "SHELL ERROR $?" ) | grep -v " iCCP: "', $p); return $cmdoutput === ""; } |