Fix regression in resizing JPEG images with Imagick (#5376)

Conflicts: program/lib/Roundcube/rcube_image.php
roundcube · Jul 29, 2016 · 654d4e5 · 654d4e5
1 parent 0ec4864
commit 654d4e5
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -2,6 +2,7 @@ CHANGELOG Roundcube Webmail
 ===========================
 
 - Enigma: Add possibility to configure gpg-agent binary location (enigma_pgp_agent)
+- Fix regression in resizing JPEG images with Imagick (#5376)
 
 RELEASE 1.2.1
 -------------

diff --git a/program/lib/Roundcube/rcube_image.php b/program/lib/Roundcube/rcube_image.php
@@ -166,10 +166,16 @@ public function resize($size, $filename = null, $browser_compat = false)
                     else {
                         try {
                             $image = new Imagick($this->image_file);
-
-                            $image->setImageBackgroundColor('white');
-                            $image->setImageAlphaChannel(11);
-                            $image->mergeImageLayers(Imagick::LAYERMETHOD_FLATTEN);
+
+                            try {
+                                // it throws exception on formats not supporting these features
+                                $image->setImageBackgroundColor('white');
+                                $image->setImageAlphaChannel(11);
+                                $image->mergeImageLayers(Imagick::LAYERMETHOD_FLATTEN);
+                            }
+                            catch (Exception $e) {
+                                // ignore errors
+                            }
 
                             $image->setImageColorspace(Imagick::COLORSPACE_SRGB);
                             $image->setImageCompressionQuality(75);