--- a/wp/wp-includes/class-wp-image-editor-gd.php Mon Jun 08 16:11:51 2015 +0000
+++ b/wp/wp-includes/class-wp-image-editor-gd.php Tue Jun 09 03:35:32 2015 +0200
@@ -15,10 +15,12 @@
* @uses WP_Image_Editor Extends class
*/
class WP_Image_Editor_GD extends WP_Image_Editor {
+ /**
+ * @var resource
+ */
+ protected $image; // GD Resource
- protected $image = false; // GD Resource
-
- function __destruct() {
+ public function __destruct() {
if ( $this->image ) {
// we don't need the original in memory anymore
imagedestroy( $this->image );
@@ -77,7 +79,7 @@
* @since 3.5.0
* @access protected
*
- * @return boolean|\WP_Error
+ * @return boolean|WP_Error True if loaded successfully; WP_Error on failure.
*/
public function load() {
if ( $this->image )
@@ -86,8 +88,17 @@
if ( ! is_file( $this->file ) && ! preg_match( '|^https?://|', $this->file ) )
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|string $limit Maximum memory limit to allocate for images. Default WP_MAX_MEMORY_LIMIT.
+ * Accepts an integer (bytes), or a shorthand string notation, such as '256M'.
+ */
// 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 ) );
if ( ! is_resource( $this->image ) )
@@ -105,7 +116,7 @@
$this->update_size( $size[0], $size[1] );
$this->mime_type = $size['mime'];
- return true;
+ return $this->set_quality();
}
/**
@@ -131,12 +142,16 @@
* Resizes current image.
* Wraps _resize, since _resize returns a GD Resource.
*
+ * 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
*
- * @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 ) {
@@ -183,28 +198,42 @@
* @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 int $width Image width.
- * @type int $height Image height.
- * @type bool $crop Optional. Whether to crop the image. Default false.
+ * @type int ['width'] Optional. Image width.
+ * @type int ['height'] Optional. Image height.
+ * @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();
$orig_size = $this->size;
foreach ( $sizes as $size => $size_data ) {
- if ( ! ( isset( $size_data['width'] ) && isset( $size_data['height'] ) ) )
+ if ( ! isset( $size_data['width'] ) && ! isset( $size_data['height'] ) ) {
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;
+ }
$image = $this->_resize( $size_data['width'], $size_data['height'], $size_data['crop'] );
+ $duplicate = ( ( $orig_size['width'] == $size_data['width'] ) && ( $orig_size['height'] == $size_data['height'] ) );
- if( ! is_wp_error( $image ) ) {
+ if ( ! is_wp_error( $image ) && ! $duplicate ) {
$resized = $this->_save( $image );
imagedestroy( $image );
@@ -227,7 +256,6 @@
* @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.
@@ -279,9 +307,12 @@
*/
public function rotate( $angle ) {
if ( function_exists('imagerotate') ) {
- $rotated = imagerotate( $this->image, $angle, 0 );
+ $transparency = imagecolorallocatealpha( $this->image, 255, 255, 255, 127 );
+ $rotated = imagerotate( $this->image, $angle, $transparency );
if ( is_resource( $rotated ) ) {
+ imagealphablending( $rotated, true );
+ imagesavealpha( $rotated, true );
imagedestroy( $this->image );
$this->image = $rotated;
$this->update_size();
@@ -327,8 +358,8 @@
* @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 ) {
@@ -342,6 +373,12 @@
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 );
@@ -361,7 +398,7 @@
return new WP_Error( 'image_save_error', __('Image Editor Save Failed') );
}
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->get_quality() ) ) )
return new WP_Error( 'image_save_error', __('Image Editor Save Failed') );
}
else {
@@ -373,12 +410,19 @@
$perms = $stat['mode'] & 0000666; //same permissions as parent folder, strip off the executable bits
@ 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,
);
}
@@ -402,7 +446,7 @@
return imagegif( $this->image );
default:
header( 'Content-Type: image/jpeg' );
- return imagejpeg( $this->image, null, $this->quality );
+ return imagejpeg( $this->image, null, $this->get_quality() );
}
}