Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2025-01-24 17:21:34 +01:00
Code Issues Projects Releases Wiki Activity

Responsive images: fix calculations when determining whether to include particular image file in srcset.

Browse Source 
Props joemcgill.
Fixes #34955 for trunk.
Built from https://develop.svn.wordpress.org/trunk@36031


git-svn-id: http://core.svn.wordpress.org/trunk@35996 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Andrew Ozz 2015-12-20 02:39:32 +00:00
parent 5399b2137f
commit 6e49a963b1
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
wp-includes/media.php
View File

@ -1015,9 +1015,6 @@ function wp_calculate_image_srcset( $size_array, $image_src, $image_meta, $attac
$image_baseurl = trailingslashit( $image_baseurl ); $image_baseurl = trailingslashit( $image_baseurl );
// Calculate the image aspect ratio.
$image_ratio = $image_height / $image_width;
/* /*
* Images that have been edited in WordPress after being uploaded will * Images that have been edited in WordPress after being uploaded will
* contain a unique hash. Look for that hash and use it later to filter * contain a unique hash. Look for that hash and use it later to filter
@ -1054,15 +1051,21 @@ function wp_calculate_image_srcset( $size_array, $image_src, $image_meta, $attac
continue; continue;
} }
// Calculate the new image ratio. /**
if ( $image['width'] ) { * To check for varying crops, we calculate the expected size of the smaller
$image_ratio_compare = $image['height'] / $image['width']; * image if the larger were constrained by the width of the smaller and then
* see if it matches what we're expecting.
*/
if ( $image_width > $image['width'] ) {
$constrained_size = wp_constrain_dimensions( $image_width, $image_height, $image['width'] );
$expected_size = array( $image['width'], $image['height'] );
} else { } else {
$image_ratio_compare = 0; $constrained_size = wp_constrain_dimensions( $image['width'], $image['height'], $image_width );
$expected_size = array( $image_width, $image_height );
} }
// If the new ratio differs by less than 0.002, use it. // If the image dimensions are within 1px of the expected size, use it.
if ( abs( $image_ratio - $image_ratio_compare ) < 0.002 ) { if ( abs( $constrained_size[0] - $expected_size[0] ) <= 1 && abs( $constrained_size[1] - $expected_size[1] ) <= 1 ) {
// Add the URL, descriptor, and value to the sources array to be returned. // Add the URL, descriptor, and value to the sources array to be returned.
$sources[ $image['width'] ] = array( $sources[ $image['width'] ] = array(
'url' => $image_baseurl . $image['file'], 'url' => $image_baseurl . $image['file'],

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.5-alpha-36030'; $wp_version = '4.5-alpha-36031';
/** /**
* 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.