WordPress 3.8.1

[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 2e1bebc994afcee056a2301c2d63aad7176d9e33..f3c9451ec3a312d6b22de6a1e9a2980a555b4654 100644 (file)
--- a/wp-includes/class-wp-image-editor-imagick.php
+++ b/wp-includes/class-wp-image-editor-imagick.php
@@ -119,6 +119,7 @@ class WP_Image_Editor_Imagick extends WP_Image_Editor {
                if ( ! is_file( $this->file ) && ! preg_match( '|^https?://|', $this->file ) )
                        return new WP_Error( 'error_loading_image', __('File doesn’t exist?'), $this->file );
 
                if ( ! is_file( $this->file ) && ! preg_match( '|^https?://|', $this->file ) )
                        return new WP_Error( 'error_loading_image', __('File doesn’t exist?'), $this->file );
 

+               /** This filter is documented in wp-includes/class-wp-image-editor-imagick.php */

                // Even though Imagick uses less PHP memory than GD, set higher limit for users that have low PHP.ini limits
                @ini_set( 'memory_limit', apply_filters( 'image_memory_limit', WP_MAX_MEMORY_LIMIT ) );
 
                // Even though Imagick uses less PHP memory than GD, set higher limit for users that have low PHP.ini limits
                @ini_set( 'memory_limit', apply_filters( 'image_memory_limit', WP_MAX_MEMORY_LIMIT ) );
 


@@ -142,7 +143,7 @@ class WP_Image_Editor_Imagick extends WP_Image_Editor {
                if ( is_wp_error( $updated_size ) )
                                return $updated_size;
 
                if ( is_wp_error( $updated_size ) )
                                return $updated_size;
 

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

        }
 
        /**
        }
 
        /**


@@ -152,15 +153,19 @@ class WP_Image_Editor_Imagick extends WP_Image_Editor {
         * @access public
         *
         * @param int $quality Compression Quality. Range: [1,100]
         * @access public
         *
         * @param int $quality Compression Quality. Range: [1,100]

-        * @return boolean|WP_Error
+        * @return boolean|WP_Error True if set successfully; WP_Error on failure.

         */
        public function set_quality( $quality = null ) {
         */
        public function set_quality( $quality = null ) {

-               if ( !$quality )
+               $quality_result = parent::set_quality( $quality );
+               if ( is_wp_error( $quality_result ) ) {
+                       return $quality_result;
+               } else {

                        $quality = $this->quality;
                        $quality = $this->quality;

+               }

 
                try {
 
                try {

-                       if( 'image/jpeg' == $this->mime_type ) {
-                               $this->image->setImageCompressionQuality( apply_filters( 'jpeg_quality', $quality, 'image_resize' ) );
+                       if ( 'image/jpeg' == $this->mime_type ) {
+                               $this->image->setImageCompressionQuality( $quality );

                                $this->image->setImageCompression( imagick::COMPRESSION_JPEG );
                        }
                        else {
                                $this->image->setImageCompression( imagick::COMPRESSION_JPEG );
                        }
                        else {


@@ -171,7 +176,7 @@ class WP_Image_Editor_Imagick extends WP_Image_Editor {
                        return new WP_Error( 'image_quality_error', $e->getMessage() );
                }
 
                        return new WP_Error( 'image_quality_error', $e->getMessage() );
                }
 

-               return parent::set_quality( $quality );
+               return true;

        }
 
        /**
        }
 
        /**


@@ -447,11 +452,12 @@ class WP_Image_Editor_Imagick extends WP_Image_Editor {
                $perms = $stat['mode'] & 0000666; //same permissions as parent folder, strip off the executable bits
                @ chmod( $filename, $perms );
 
                $perms = $stat['mode'] & 0000666; //same permissions as parent folder, strip off the executable bits
                @ chmod( $filename, $perms );
 

+               /** This filter is documented in wp-includes/class-wp-image-editor-gd.php */

                return array(
                return array(

-                       'path' => $filename,
-                       'file' => wp_basename( apply_filters( 'image_make_intermediate_size', $filename ) ),
-                       'width' => $this->size['width'],
-                       'height' => $this->size['height'],
+                       'path'      => $filename,
+                       'file'      => wp_basename( apply_filters( 'image_make_intermediate_size', $filename ) ),
+                       'width'     => $this->size['width'],
+                       'height'    => $this->size['height'],

                        'mime-type' => $mime_type,
                );
        }
                        'mime-type' => $mime_type,
                );
        }