- Fixed ZETACOMP-55: Imagick composite with empty string parameter in

watermark doesn't work. (Patch by Xiongjie Chen) git-svn-id: http://svn.ez.no/svn/ezcomponents/trunk@11477 bc0e7bdc-f0fc-0310-8ff6-f601c06e1256
xmak · Mar 8, 2011 · 4223c06 · 4223c06
1 parent cc13644
commit 4223c06
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/ImageConversion/ChangeLog b/ImageConversion/ChangeLog
@@ -1,4 +1,10 @@
-1.3.8 - [RELEASEDATE]
+1.3.9 - [RELEASEDATE]
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+- Fixed ZETACOMP-55: Imagick composite with empty string parameter in
+  watermark doesn't work. (Patch by Xiongjie Chen)
+
+
+1.3.8 - Monday 22 March 2010
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 - Fixed issue #15011: ImageMagick handler does now correctly use the binary

diff --git a/ImageConversion/src/handlers/imagemagick.php b/ImageConversion/src/handlers/imagemagick.php
@@ -587,8 +587,7 @@ public function watermarkAbsolute( $image, $posX, $posY, $width = false, $height
 
         $this->addFilterOption(
             $this->getActiveReference(),
-            '-composite',
-            '' 
+            '-composite' 
         );
 
         $this->addFilterOption(