Changeset 36031 for trunk/src/wp-includes/media.php

Timestamp:

12/20/2015 02:38:34 AM (11 years ago)

Author:

azaozz

Message:

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

Props joemcgill.
Fixes #34955 for trunk.

File:

• trunk/src/wp-includes/media.php (modified) (2 diffs)

trunk/src/wp-includes/media.php

@@ -1016 +1016 @@
         $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
@@ -1055 +1052 @@
                 }
 
-                // Calculate the new image ratio.
-                if ( $image['width'] ) {
-                        $image_ratio_compare = $image['height'] / $image['width'];
+                /**
+                 * To check for varying crops, we calculate the expected size of the smaller
+                 * 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 {
-                        $image_ratio_compare = 0;
-                }
-
-                // If the new ratio differs by less than 0.002, use it.
-                if ( abs( $image_ratio - $image_ratio_compare ) < 0.002 ) {
+                        $constrained_size = wp_constrain_dimensions( $image['width'], $image['height'], $image_width );
+                        $expected_size = array( $image_width, $image_height );
+                }
+
+                // If the image dimensions are within 1px of the expected size, use it.
+                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.
                         $sources[ $image['width'] ] = array(