X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/48ab98cb1779cf2088c1351ac3dd3d0da6fb31d3..caeaf8dc94b5e3f75dc98ec92dc7b76049cdddb6:/wp-includes/class-wp-image-editor-gd.php diff --git a/wp-includes/class-wp-image-editor-gd.php b/wp-includes/class-wp-image-editor-gd.php index ef804571..ddba1ff8 100644 --- a/wp-includes/class-wp-image-editor-gd.php +++ b/wp-includes/class-wp-image-editor-gd.php @@ -15,8 +15,10 @@ * @uses WP_Image_Editor Extends class */ class WP_Image_Editor_GD extends WP_Image_Editor { - - protected $image = false; // GD Resource + /** + * @var resource + */ + protected $image; // GD Resource public function __destruct() { if ( $this->image ) { @@ -114,7 +116,7 @@ class WP_Image_Editor_GD extends WP_Image_Editor { $this->update_size( $size[0], $size[1] ); $this->mime_type = $size['mime']; - return true; + return $this->set_quality(); } /** @@ -253,7 +255,6 @@ class WP_Image_Editor_GD extends WP_Image_Editor { * @since 3.5.0 * @access public * - * @param string|int $src The source file or Attachment ID. * @param int $src_x The start x position to crop from. * @param int $src_y The start y position to crop from. * @param int $src_w The width to crop. @@ -353,8 +354,8 @@ class WP_Image_Editor_GD extends WP_Image_Editor { * @since 3.5.0 * @access public * - * @param string $destfilename - * @param string $mime_type + * @param string|null $filename + * @param string|null $mime_type * @return array|WP_Error {'path'=>string, 'file'=>string, 'width'=>int, 'height'=>int, 'mime-type'=>string} */ public function save( $filename = null, $mime_type = null ) { @@ -368,6 +369,12 @@ class WP_Image_Editor_GD extends WP_Image_Editor { return $saved; } + /** + * @param resource $image + * @param string|null $filename + * @param string|null $mime_type + * @return WP_Error|array + */ protected function _save( $image, $filename = null, $mime_type = null ) { list( $filename, $extension, $mime_type ) = $this->get_output_format( $filename, $mime_type );