WordPress 4.1.4-scripts

[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 f3c9451ec3a312d6b22de6a1e9a2980a555b4654..843b85c541076983ca21f65c938c60929acbb5bc 100644 (file)
--- a/wp-includes/class-wp-image-editor-imagick.php
+++ b/wp-includes/class-wp-image-editor-imagick.php
@@ -15,10 +15,12 @@
  * @uses WP_Image_Editor Extends class
  */
 class WP_Image_Editor_Imagick extends WP_Image_Editor {
  * @uses WP_Image_Editor Extends class
  */
 class WP_Image_Editor_Imagick extends WP_Image_Editor {

+       /**
+        * @var Imagick
+        */
+       protected $image; // Imagick Object

 
 

-       protected $image = null; // Imagick Object
-
-       function __destruct() {
+       public function __destruct() {

                if ( $this->image instanceof Imagick ) {
                        // we don't need the original in memory anymore
                        $this->image->clear();
                if ( $this->image instanceof Imagick ) {
                        // we don't need the original in memory anymore
                        $this->image->clear();


@@ -140,10 +142,11 @@ class WP_Image_Editor_Imagick extends WP_Image_Editor {
                }
 
                $updated_size = $this->update_size();
                }
 
                $updated_size = $this->update_size();

-               if ( is_wp_error( $updated_size ) )
-                               return $updated_size;
+               if ( is_wp_error( $updated_size ) ) {
+                       return $updated_size;
+               }

 
 

-               return $this->set_quality( $this->quality );
+               return $this->set_quality();

        }
 
        /**
        }
 
        /**


@@ -160,7 +163,7 @@ class WP_Image_Editor_Imagick extends WP_Image_Editor {
                if ( is_wp_error( $quality_result ) ) {
                        return $quality_result;
                } else {
                if ( is_wp_error( $quality_result ) ) {
                        return $quality_result;
                } else {

-                       $quality = $this->quality;
+                       $quality = $this->get_quality();

                }
 
                try {
                }
 
                try {


@@ -211,12 +214,16 @@ class WP_Image_Editor_Imagick extends WP_Image_Editor {
        /**
         * Resizes current image.
         *
        /**
         * Resizes current image.
         *

+        * At minimum, either a height or width must be provided.
+        * If one of the two is set to null, the resize will
+        * maintain aspect ratio according to the provided dimension.
+        *

         * @since 3.5.0
         * @access public
         *
         * @since 3.5.0
         * @access public
         *

-        * @param int $max_w
-        * @param int $max_h
-        * @param boolean $crop
+        * @param  int|null $max_w Image width.
+        * @param  int|null $max_h Image height.
+        * @param  boolean  $crop

         * @return boolean|WP_Error
         */
        public function resize( $max_w, $max_h, $crop = false ) {
         * @return boolean|WP_Error
         */
        public function resize( $max_w, $max_h, $crop = false ) {


@@ -255,13 +262,17 @@ class WP_Image_Editor_Imagick extends WP_Image_Editor {
         * @param array $sizes {
         *     An array of image size arrays. Default sizes are 'small', 'medium', 'large'.
         *
         * @param array $sizes {
         *     An array of image size arrays. Default sizes are 'small', 'medium', 'large'.
         *

+        *     Either a height or width must be provided.
+        *     If one of the two is set to null, the resize will
+        *     maintain aspect ratio according to the provided dimension.
+        *

         *     @type array $size {
         *     @type array $size {

-        *         @type int  $width  Image width.
-        *         @type int  $height Image height.
+        *         @type int  ['width']  Optional. Image width.
+        *         @type int  ['height'] Optional. Image height.

         *         @type bool $crop   Optional. Whether to crop the image. Default false.
         *     }
         * }
         *         @type bool $crop   Optional. Whether to crop the image. Default false.
         *     }
         * }

-        * @return array An array of resized images metadata by size.
+        * @return array An array of resized images' metadata by size.

         */
        public function multi_resize( $sizes ) {
                $metadata = array();
         */
        public function multi_resize( $sizes ) {
                $metadata = array();


@@ -272,11 +283,20 @@ class WP_Image_Editor_Imagick extends WP_Image_Editor {
                        if ( ! $this->image )
                                $this->image = $orig_image->getImage();
 
                        if ( ! $this->image )
                                $this->image = $orig_image->getImage();
 

-                       if ( ! ( isset( $size_data['width'] ) && isset( $size_data['height'] ) ) )
+                       if ( ! isset( $size_data['width'] ) && ! isset( $size_data['height'] ) ) {

                                continue;
                                continue;

+                       }

 
 

-                       if ( ! isset( $size_data['crop'] ) )
+                       if ( ! isset( $size_data['width'] ) ) {
+                               $size_data['width'] = null;
+                       }
+                       if ( ! isset( $size_data['height'] ) ) {
+                               $size_data['height'] = null;
+                       }
+
+                       if ( ! isset( $size_data['crop'] ) ) {

                                $size_data['crop'] = false;
                                $size_data['crop'] = false;

+                       }

 
                        $resize_result = $this->resize( $size_data['width'], $size_data['height'], $size_data['crop'] );
 
 
                        $resize_result = $this->resize( $size_data['width'], $size_data['height'], $size_data['crop'] );