Changeset 26645 for trunk/src/wp-includes/class-wp-image-editor-imagick.php

Timestamp:

12/04/2013 10:48:45 PM (13 years ago)

Author:

nacin

Message:

Improvements to image quality handling in the image editor classes.

props markoheijnen, DH-Shredder.
fixes #25721.

File:

• trunk/src/wp-includes/class-wp-image-editor-imagick.php (modified) (5 diffs)

trunk/src/wp-includes/class-wp-image-editor-imagick.php

@@ -120 +120 @@
                         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 ) );
@@ -143 +144 @@
                                 return $updated_size;
 
-                return $this->set_quality();
+                return $this->set_quality( $this->quality );
         }
 
@@ -153 +154 @@
          *
          * @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 ) {
-                if ( !$quality )
+                $quality_result = parent::set_quality( $quality );
+                if ( is_wp_error( $quality_result ) ) {
+                        return $quality_result;
+                } else {
                         $quality = $this->quality;
-
-                try {
-                        if( 'image/jpeg' == $this->mime_type ) {
-                                $this->image->setImageCompressionQuality( apply_filters( 'jpeg_quality', $quality, 'image_resize' ) );
+                }
+
+                try {
+                        if ( 'image/jpeg' == $this->mime_type ) {
+                                $this->image->setImageCompressionQuality( $quality );
                                 $this->image->setImageCompression( imagick::COMPRESSION_JPEG );
                         }
@@ -172 +177 @@
                 }
 
-                return parent::set_quality( $quality );
+                return true;
         }
 
@@ -448 +453 @@
                 @ chmod( $filename, $perms );
 
+                /** This filter is documented in wp-includes/class-wp-image-editor-gd.php */ 
                 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,
                 );