Wordpress 3.7

[autoinstalls/wordpress.git] / wp-includes / class-wp-image-editor-imagick.php

diff --git a/wp-includes/class-wp-image-editor-imagick.php b/wp-includes/class-wp-image-editor-imagick.php
index 21e4e0cac36b9fa70070000b301c671c5f468659..2e1bebc994afcee056a2301c2d63aad7176d9e33 100644 (file)
--- a/wp-includes/class-wp-image-editor-imagick.php
+++ b/wp-includes/class-wp-image-editor-imagick.php
@@ -19,7 +19,7 @@ class WP_Image_Editor_Imagick extends WP_Image_Editor {
        protected $image = null; // Imagick Object
 
        function __destruct() {
-               if ( $this->image ) {
+               if ( $this->image instanceof Imagick ) {
                        // we don't need the original in memory anymore
                        $this->image->clear();
                        $this->image->destroy();
@@ -97,7 +97,7 @@ class WP_Image_Editor_Imagick extends WP_Image_Editor {
                                return false;
 
                try {
-                       return ( (bool) Imagick::queryFormats( $imagick_extension ) );
+                       return ( (bool) @Imagick::queryFormats( $imagick_extension ) );
                }
                catch ( Exception $e ) {
                        return false;
@@ -113,7 +113,7 @@ class WP_Image_Editor_Imagick extends WP_Image_Editor {
         * @return boolean|WP_Error True if loaded; WP_Error on failure.
         */
        public function load() {
-               if ( $this->image )
+               if ( $this->image instanceof Imagick )
                        return true;
 
                if ( ! is_file( $this->file ) && ! preg_match( '|^https?://|', $this->file ) )
@@ -242,14 +242,21 @@ class WP_Image_Editor_Imagick extends WP_Image_Editor {
        }
 
        /**
-        * Processes current image and saves to disk
-        * multiple sizes from single source.
+        * Resize multiple images from a single source.
         *
         * @since 3.5.0
         * @access public
         *
-        * @param array $sizes { {'width'=>int, 'height'=>int, 'crop'=>bool}, ... }
-        * @return array
+        * @param array $sizes {
+        *     An array of image size arrays. Default sizes are 'small', 'medium', 'large'.
+        *
+        *     @type array $size {
+        *         @type int  $width  Image width.
+        *         @type int  $height Image height.
+        *         @type bool $crop   Optional. Whether to crop the image. Default false.
+        *     }
+        * }
+        * @return array An array of resized images metadata by size.
         */
        public function multi_resize( $sizes ) {
                $metadata = array();
@@ -260,6 +267,12 @@ class WP_Image_Editor_Imagick extends WP_Image_Editor {
                        if ( ! $this->image )
                                $this->image = $orig_image->getImage();
 
+                       if ( ! ( isset( $size_data['width'] ) && isset( $size_data['height'] ) ) )
+                               continue;
+
+                       if ( ! isset( $size_data['crop'] ) )
+                               $size_data['crop'] = false;
+
                        $resize_result = $this->resize( $size_data['width'], $size_data['height'], $size_data['crop'] );
 
                        if( ! is_wp_error( $resize_result ) ) {
@@ -343,11 +356,18 @@ class WP_Image_Editor_Imagick extends WP_Image_Editor {
                 */
                try {
                        $this->image->rotateImage( new ImagickPixel('none'), 360-$angle );
+
+                       // Since this changes the dimensions of the image, update the size.
+                       $result = $this->update_size();
+                       if ( is_wp_error( $result ) )
+                               return $result;
+
+                       $this->image->setImagePage( $this->size['width'], $this->size['height'], 0, 0 );
                }
                catch ( Exception $e ) {
                        return new WP_Error( 'image_rotate_error', $e->getMessage() );
                }
-               return $this->update_size();
+               return true;
        }
 
        /**
@@ -356,8 +376,8 @@ class WP_Image_Editor_Imagick extends WP_Image_Editor {
         * @since 3.5.0
         * @access public
         *
-        * @param boolean $horz Horizontal Flip
-        * @param boolean $vert Vertical Flip
+        * @param boolean $horz Flip along Horizontal Axis
+        * @param boolean $vert Flip along Vertical Axis
         * @returns boolean|WP_Error
         */
        public function flip( $horz, $vert ) {