From: Michael J. Rubinsky <mrubinsk@horde.org>
Date: Sat, 20 Feb 2010 20:32:07 +0000 (-0500)
Subject: We need to be calling setImageFormat(), not setFormat() here.
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=890b63dbe3965c0cb64daf328a9f7aeb56ca9da2;p=horde.git

We need to be calling setImageFormat(), not setFormat() here.

Damn hard to find this bug, but finally fixes issue causing thumbnails
to loose transparency when applying certain compound effects.
---

diff --git a/framework/Image/lib/Horde/Image/Imagick.php b/framework/Image/lib/Horde/Image/Imagick.php
index 0e61c1b66..3c4ef31d7 100644
--- a/framework/Image/lib/Horde/Image/Imagick.php
+++ b/framework/Image/lib/Horde/Image/Imagick.php
@@ -87,11 +87,12 @@ class Horde_Image_Imagick extends Horde_Image_Base
         parent::loadString($image_data);
         $this->_imagick->clear();
         try {
-            $this->_imagick->readImageBlob($image_data);
+            $this->_imagick->readImageBlob($this->_data);
         } catch (ImagickException $e) {
             throw new Horde_Image_Exception($e);
         }
-        $this->_imagick->setFormat($this->_type);
+        $this->_imagick->setImageFormat($this->_type);
+        unset($this->_data);
         $this->_imagick->setIteratorIndex(0);
     }
 
@@ -114,7 +115,7 @@ class Horde_Image_Imagick extends Horde_Image_Base
         } catch (ImagickException $e) {
             throw new Horde_Image_Exception($e);
         }
-        $this->_imagick->setFormat($this->_type);
+        $this->_imagick->setImageFormat($this->_type);
         $this->_imagick->setIteratorIndex(0);
         unset($this->_data);
     }