11411 - in /trunk/ImageConversion: ChangeLog src/handlers/imagemagick_base.php tests/handlershell_test.php

Author: ts
Date: Tue Mar 16 16:52:57 2010
New Revision: 11411

Log:
- Fixed issue #15011: ImageMagick handler does now correctly use the binary
  set through handler options.

Modified:
    trunk/ImageConversion/ChangeLog
    trunk/ImageConversion/src/handlers/imagemagick_base.php
    trunk/ImageConversion/tests/handlershell_test.php

Modified: trunk/ImageConversion/ChangeLog
==============================================================================
--- trunk/ImageConversion/ChangeLog [iso-8859-1] (original)
+++ trunk/ImageConversion/ChangeLog [iso-8859-1] Tue Mar 16 16:52:57 2010
 <at>  <at>  -3,6 +3,8  <at>  <at> 

 - Fixed issue #15976: ImageMagick based scalePercent filter now allows values
   > 100 for the width value, too.
+- Fixed issue #15011: ImageMagick handler does now correctly use the binary
+  set through handler options.

 1.3.7 - Monday 22 June 2009
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

Modified: trunk/ImageConversion/src/handlers/imagemagick_base.php
==============================================================================
--- trunk/ImageConversion/src/handlers/imagemagick_base.php [iso-8859-1] (original)
+++ trunk/ImageConversion/src/handlers/imagemagick_base.php [iso-8859-1] Tue Mar 16 16:52:57 2010
 <at>  <at>  -398,7 +398,7  <at>  <at> 
         }
         else if ( file_exists( $settings->options['binary'] ) )
         {
-            $this->binary = $this->settings['binary'];
+            $this->binary = $settings->options['binary'];
         }

         if ( $this->binary === null )

Modified: trunk/ImageConversion/tests/handlershell_test.php
==============================================================================
--- trunk/ImageConversion/tests/handlershell_test.php [iso-8859-1] (original)
+++ trunk/ImageConversion/tests/handlershell_test.php [iso-8859-1] Tue Mar 16 16:52:57 2010
 <at>  <at>  -41,6 +41,18  <at>  <at> 
         parent::setUp();
     }

+    public function testInitFromSetBinary()
+    {
+        $settings = ezcImageImagemagickHandler::defaultSettings();
+        $settings->options['binary'] = ezcBaseFeatures::getImageConvertExecutable();
+
+        $handler = new ezcImageImagemagickHandler( $settings );
+
+        $filePath = $this->testFiles["jpeg"];
+
+        $ref = $handler->load( $filePath );
+        $handler->close( $ref );
+    }

     public function testLoadSuccess()
     {