WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upload: Exclude PNG images from scaling after uploading. Fixes a case where resizing a very large PNG may create a scaled image that has smaller dimensions but larger file size than the original. 

Fixes #48736.
Built from https://develop.svn.wordpress.org/trunk@46809


git-svn-id: http://core.svn.wordpress.org/trunk@46609 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Andrew Ozz 2019-12-01 18:26:05 +00:00
parent 221287f626
commit 135e608b46
2 changed files with 74 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

142
wp-admin/includes/image.php
View File

@ -244,93 +244,97 @@ function wp_create_image_subsizes( $file, $attachment_id ) {
$image_meta['image_meta'] = $exif_meta; $image_meta['image_meta'] = $exif_meta;
} }
/** // Do not scale (large) PNG images. May result in sub-sizes that have greater file size than the original. See #48736.
* Filters the "BIG image" threshold value. if ( $imagesize['mime'] !== 'image/png' ) {
*
* If the original image width or height is above the threshold, it will be scaled down. The threshold is
* used as max width and max height. The scaled down image will be used as the largest available size, including
* the `_wp_attached_file` post meta value.
*
* Returning `false` from the filter callback will disable the scaling.
*
* @since 5.3.0
*
* @param int $threshold The threshold value in pixels. Default 2560.
* @param array $imagesize {
* Indexed array of the image width and height in pixels.
*
* @type int $0 The image width.
* @type int $1 The image height.
* }
* @param string $file Full path to the uploaded image file.
* @param int $attachment_id Attachment post ID.
*/
$threshold = (int) apply_filters( 'big_image_size_threshold', 2560, $imagesize, $file, $attachment_id );
// If the original image's dimensions are over the threshold, scale the image /**
// and use it as the "full" size. * Filters the "BIG image" threshold value.
if ( $threshold && ( $image_meta['width'] > $threshold || $image_meta['height'] > $threshold ) ) { *
$editor = wp_get_image_editor( $file ); * If the original image width or height is above the threshold, it will be scaled down. The threshold is
* used as max width and max height. The scaled down image will be used as the largest available size, including
* the `_wp_attached_file` post meta value.
*
* Returning `false` from the filter callback will disable the scaling.
*
* @since 5.3.0
*
* @param int $threshold The threshold value in pixels. Default 2560.
* @param array $imagesize {
* Indexed array of the image width and height in pixels.
*
* @type int $0 The image width.
* @type int $1 The image height.
* }
* @param string $file Full path to the uploaded image file.
* @param int $attachment_id Attachment post ID.
*/
$threshold = (int) apply_filters( 'big_image_size_threshold', 2560, $imagesize, $file, $attachment_id );
if ( is_wp_error( $editor ) ) { // If the original image's dimensions are over the threshold, scale the image
// This image cannot be edited. // and use it as the "full" size.
return $image_meta; if ( $threshold && ( $image_meta['width'] > $threshold || $image_meta['height'] > $threshold ) ) {
} $editor = wp_get_image_editor( $file );
// Resize the image if ( is_wp_error( $editor ) ) {
$resized = $editor->resize( $threshold, $threshold ); // This image cannot be edited.
$rotated = null; return $image_meta;
}
// If there is EXIF data, rotate according to EXIF Orientation. // Resize the image
if ( ! is_wp_error( $resized ) && is_array( $exif_meta ) ) { $resized = $editor->resize( $threshold, $threshold );
$resized = $editor->maybe_exif_rotate(); $rotated = null;
$rotated = $resized;
}
if ( ! is_wp_error( $resized ) ) { // If there is EXIF data, rotate according to EXIF Orientation.
// Append "-scaled" to the image file name. It will look like "my_image-scaled.jpg". if ( ! is_wp_error( $resized ) && is_array( $exif_meta ) ) {
// This doesn't affect the sub-sizes names as they are generated from the original image (for best quality). $resized = $editor->maybe_exif_rotate();
$saved = $editor->save( $editor->generate_filename( 'scaled' ) ); $rotated = $resized;
}
if ( ! is_wp_error( $saved ) ) { if ( ! is_wp_error( $resized ) ) {
$image_meta = _wp_image_meta_replace_original( $saved, $file, $image_meta, $attachment_id ); // Append "-scaled" to the image file name. It will look like "my_image-scaled.jpg".
// This doesn't affect the sub-sizes names as they are generated from the original image (for best quality).
$saved = $editor->save( $editor->generate_filename( 'scaled' ) );
// If the image was rotated update the stored EXIF data. if ( ! is_wp_error( $saved ) ) {
if ( true === $rotated && ! empty( $image_meta['image_meta']['orientation'] ) ) { $image_meta = _wp_image_meta_replace_original( $saved, $file, $image_meta, $attachment_id );
$image_meta['image_meta']['orientation'] = 1;
// If the image was rotated update the stored EXIF data.
if ( true === $rotated && ! empty( $image_meta['image_meta']['orientation'] ) ) {
$image_meta['image_meta']['orientation'] = 1;
}
} else {
// TODO: log errors.
} }
} else { } else {
// TODO: log errors. // TODO: log errors.
} }
} else { } elseif ( ! empty( $exif_meta['orientation'] ) && (int) $exif_meta['orientation'] !== 1 ) {
// TODO: log errors. // Rotate the whole original image if there is EXIF data and "orientation" is not 1.
}
} elseif ( ! empty( $exif_meta['orientation'] ) && (int) $exif_meta['orientation'] !== 1 ) {
// Rotate the whole original image if there is EXIF data and "orientation" is not 1.
$editor = wp_get_image_editor( $file ); $editor = wp_get_image_editor( $file );
if ( is_wp_error( $editor ) ) { if ( is_wp_error( $editor ) ) {
// This image cannot be edited. // This image cannot be edited.
return $image_meta; return $image_meta;
} }
// Rotate the image // Rotate the image
$rotated = $editor->maybe_exif_rotate(); $rotated = $editor->maybe_exif_rotate();
if ( true === $rotated ) { if ( true === $rotated ) {
// Append `-rotated` to the image file name. // Append `-rotated` to the image file name.
$saved = $editor->save( $editor->generate_filename( 'rotated' ) ); $saved = $editor->save( $editor->generate_filename( 'rotated' ) );
if ( ! is_wp_error( $saved ) ) { if ( ! is_wp_error( $saved ) ) {
$image_meta = _wp_image_meta_replace_original( $saved, $file, $image_meta, $attachment_id ); $image_meta = _wp_image_meta_replace_original( $saved, $file, $image_meta, $attachment_id );
// Update the stored EXIF data. // Update the stored EXIF data.
if ( ! empty( $image_meta['image_meta']['orientation'] ) ) { if ( ! empty( $image_meta['image_meta']['orientation'] ) ) {
$image_meta['image_meta']['orientation'] = 1; $image_meta['image_meta']['orientation'] = 1;
}
} else {
// TODO: log errors.
} }
} else {
// TODO: log errors.
} }
} }
} }

2
wp-includes/version.php
View File

@ -13,7 +13,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '5.4-alpha-46808'; $wp_version = '5.4-alpha-46809';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.