summaryrefslogtreecommitdiff
path: root/program/lib/Roundcube/rcube_image.php
diff options
context:
space:
mode:
authorThomas Bruederli <thomas@roundcube.net>2013-08-14 23:36:55 +0200
committerThomas Bruederli <thomas@roundcube.net>2013-08-14 23:36:55 +0200
commit341fa8b9a6207000d057e00678d96ada6136f783 (patch)
treef8049ade80bf816e6b9d4d843b6e83a8b132e72a /program/lib/Roundcube/rcube_image.php
parent96c4b9098bec7191c708d4e4f96b80b2768a7ef0 (diff)
parentf4ba655a41bad1d2f833e36dd3fbe7cb2a5582ee (diff)
Merge branch 'release-0.9' of github.com:roundcube/roundcubemail into release-0.9
Diffstat (limited to 'program/lib/Roundcube/rcube_image.php')
-rw-r--r--program/lib/Roundcube/rcube_image.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/program/lib/Roundcube/rcube_image.php b/program/lib/Roundcube/rcube_image.php
index 735a0df01..ffcfd4b1d 100644
--- a/program/lib/Roundcube/rcube_image.php
+++ b/program/lib/Roundcube/rcube_image.php
@@ -120,7 +120,7 @@ class rcube_image
$p['-opts'] = array('-resize' => $p['size'].'>');
if (in_array($type, explode(',', $p['types']))) { // Valid type?
- $result = rcube::exec($convert . ' 2>&1 -flatten -auto-orient -colorspace RGB -quality {quality} {-opts} {intype}:{in} {type}:{out}', $p);
+ $result = rcube::exec($convert . ' 2>&1 -flatten -auto-orient -colorspace sRGB -quality {quality} {-opts} {intype}:{in} {type}:{out}', $p);
}
if ($result === '') {
@@ -222,7 +222,7 @@ class rcube_image
$p['out'] = $filename;
$p['type'] = self::$extensions[$type];
- $result = rcube::exec($convert . ' 2>&1 -colorspace RGB -quality 75 {in} {type}:{out}', $p);
+ $result = rcube::exec($convert . ' 2>&1 -colorspace sRGB -quality 75 {in} {type}:{out}', $p);
if ($result === '') {
@chmod($filename, 0600);