<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[15002] trunk/wp-includes/media.php: Tweaks to wp_constrain_dimensions()
for better fits and consistency.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/15002">15002</a></dd>
<dt>Author</dt> <dd>markjaquith</dd>
<dt>Date</dt> <dd>2010-05-27 20:37:42 +0000 (Thu, 27 May 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Tweaks to wp_constrain_dimensions() for better fits and consistency. fixes <a href="http://trac.wordpress.org/ticket/13556">#13556</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesmediaphp">trunk/wp-includes/media.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesmediaphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/media.php (15001 => 15002)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/media.php 2010-05-27 19:20:52 UTC (rev 15001)
+++ trunk/wp-includes/media.php 2010-05-27 20:37:42 UTC (rev 15002)
</span><span class="lines">@@ -278,16 +278,39 @@
</span><span class="cx">
</span><span class="cx"> $width_ratio = $height_ratio = 1.0;
</span><span class="cx">
</span><del>- if ( $max_width > 0 && $current_width > 0 && $current_width > $max_width )
</del><ins>+ if ( $max_width > 0 && $current_width > 0 && $current_width > $max_width ) {
</ins><span class="cx"> $width_ratio = $max_width / $current_width;
</span><ins>+ $did_width = true;
+ }
</ins><span class="cx">
</span><del>- if ( $max_height > 0 && $current_height > 0 && $current_height > $max_height )
</del><ins>+ if ( $max_height > 0 && $current_height > 0 && $current_height > $max_height ) {
</ins><span class="cx"> $height_ratio = $max_height / $current_height;
</span><ins>+ $did_height = true;
+ }
</ins><span class="cx">
</span><del>- // the smaller ratio is the one we need to fit it to the constraining box
- $ratio = min( $width_ratio, $height_ratio );
</del><ins>+ // Calculate the larger/smaller ratios
+ $smaller_ratio = min( $width_ratio, $height_ratio );
+ $larger_ratio = max( $width_ratio, $height_ratio );
</ins><span class="cx">
</span><del>- return array( intval($current_width * $ratio), intval($current_height * $ratio) );
</del><ins>+ if ( intval( $current_width * $larger_ratio ) > $max_width || intval( $current_height * $larger_ratio ) > $max_height )
+ // The larger ratio is too big. It would result in an overflow.
+ $ratio = $smaller_ratio;
+ else
+ // The larger ratio fits, and is likely to be a more "snug" fit.
+ $ratio = $larger_ratio;
+
+ $w = intval( $current_width * $ratio );
+ $h = intval( $current_height * $ratio );
+
+ // Sometimes, due to rounding, we'll end up with a result like this: 465x700 in a 177x177 box is 117x176... a pixel short
+ // We also have issues with recursive calls resulting in an ever-changing result. Contraining to the result of a constraint should yield the original result.
+ // Thus we look for dimensions that are one pixel shy of the max value and bump them up
+ if ( isset( $did_width ) && $did_width && $w == $max_width - 1 )
+ $w = $max_width; // Round it up
+ if ( isset( $did_height ) && $did_height && $h == $max_height - 1 )
+ $h = $max_height; // Round it up
+
+ return array( $w, $h );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -521,8 +544,8 @@
</span><span class="cx"> // Skip images with unexpectedly divergent aspect ratios (crops)
</span><span class="cx"> // First, we calculate what size the original image would be if constrained to a box the size of the current image in the loop
</span><span class="cx"> $maybe_cropped = image_resize_dimensions($imagedata['width'], $imagedata['height'], $data['width'], $data['height'], false );
</span><del>- // If the size doesn't match exactly, then it is of a different aspect ratio, so we skip it, unless it's the thumbnail size
- if ( 'thumbnail' != $_size && ( !$maybe_cropped || $maybe_cropped[4] != $data['width'] || $maybe_cropped[5] != $data['height'] ) )
</del><ins>+ // If the size doesn't match within one pixel, then it is of a different aspect ratio, so we skip it, unless it's the thumbnail size
+ if ( 'thumbnail' != $_size && ( !$maybe_cropped || ( $maybe_cropped[4] != $data['width'] && $maybe_cropped[4] + 1 != $data['width'] ) || ( $maybe_cropped[5] != $data['height'] && $maybe_cropped[5] + 1 != $data['height'] ) ) )
</ins><span class="cx"> continue;
</span><span class="cx"> // If we're still here, then we're going to use this size
</span><span class="cx"> $file = $data['file'];
</span></span></pre>
</div>
</div>
</body>
</html>