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

Timestamp:

12/04/2013 10:48:45 PM (12 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-gd.php (modified) (5 diffs)

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

@@ -78 +78 @@
      * @access protected
      *
-     * @return boolean|\WP_Error
+     * @return boolean|WP_Error True if loaded successfully; WP_Error on failure.
      */
     public function load() {
@@ -87 +87 @@
             return new WP_Error( 'error_loading_image', __('File doesn’t exist?'), $this->file );
 
+        /**
+         * Filter the memory limit allocated for image manipulation.
+         *
+         * @since 3.5.0
+         *
+         * @param int Maximum memory limit to allocate (default is WP_MAX_MEMORY_LIMIT)
+         */
         // Set artificially high because GD uses uncompressed images in memory
         @ini_set( 'memory_limit', apply_filters( 'image_memory_limit', WP_MAX_MEMORY_LIMIT ) );
+
         $this->image = @imagecreatefromstring( file_get_contents( $this->file ) );
 
@@ -106 +114 @@
         $this->mime_type = $size['mime'];
 
-        return true;
+        return $this->set_quality( $this->quality );
     }
 
@@ -362 +370 @@
         }
         elseif ( 'image/jpeg' == $mime_type ) {
-            if ( ! $this->make_image( $filename, 'imagejpeg', array( $image, $filename, apply_filters( 'jpeg_quality', $this->quality, 'image_resize' ) ) ) )
+            if ( ! $this->make_image( $filename, 'imagejpeg', array( $image, $filename, $this->quality ) ) ) 
                 return new WP_Error( 'image_save_error', __('Image Editor Save Failed') );
         }
@@ -374 +382 @@
         @ chmod( $filename, $perms );
 
+        /**
+         * Filter the name of the saved image file.
+         *
+         * @since 2.6.0
+         *
+         * @param string $filename Name of the file.
+         */
         return array(
-            'path' => $filename,
-            'file' => wp_basename( apply_filters( 'image_make_intermediate_size', $filename ) ),
-            'width' => $this->size['width'],
-            'height' => $this->size['height'],
-            'mime-type'=> $mime_type,
+            'path'      => $filename,
+            'file'      => wp_basename( apply_filters( 'image_make_intermediate_size', $filename ) ),
+            'width'     => $this->size['width'],
+            'height'    => $this->size['height'],
+            'mime-type' => $mime_type,
         );
     }