<!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>[12280] trunk/wp-includes/media.php:
Avoid a rare case of black line in cropped thumbnails, props miqrogroove,
fixes #7748</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/12280">12280</a></dd>
<dt>Author</dt> <dd>azaozz</dd>
<dt>Date</dt> <dd>2009-11-26 06:58:21 +0000 (Thu, 26 Nov 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Avoid a rare case of black line in cropped thumbnails, props miqrogroove, fixes <a href="http://trac.wordpress.org/ticket/7748">#7748</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 (12279 => 12280)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/media.php 2009-11-26 05:22:09 UTC (rev 12279)
+++ trunk/wp-includes/media.php 2009-11-26 06:58:21 UTC (rev 12280)
</span><span class="lines">@@ -259,7 +259,7 @@
</span><span class="cx"> * @param bool $crop Optional, default is false. Whether to crop image or resize.
</span><span class="cx"> * @return bool|array False, on failure. Returned array matches parameters for imagecopyresampled() PHP function.
</span><span class="cx"> */
</span><del>-function image_resize_dimensions($orig_w, $orig_h, $dest_w, $dest_h, $crop=false) {
</del><ins>+function image_resize_dimensions($orig_w, $orig_h, $dest_w, $dest_h, $crop = false) {
</ins><span class="cx">
</span><span class="cx"> if ($orig_w <= 0 || $orig_h <= 0)
</span><span class="cx"> return false;
</span><span class="lines">@@ -272,22 +272,23 @@
</span><span class="cx"> $aspect_ratio = $orig_w / $orig_h;
</span><span class="cx"> $new_w = min($dest_w, $orig_w);
</span><span class="cx"> $new_h = min($dest_h, $orig_h);
</span><del>- if (!$new_w) {
</del><ins>+
+ if ( !$new_w ) {
</ins><span class="cx"> $new_w = intval($new_h * $aspect_ratio);
</span><span class="cx"> }
</span><del>- if (!$new_h) {
</del><ins>+
+ if ( !$new_h ) {
</ins><span class="cx"> $new_h = intval($new_w / $aspect_ratio);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $size_ratio = max($new_w / $orig_w, $new_h / $orig_h);
</span><span class="cx">
</span><del>- $crop_w = ceil($new_w / $size_ratio);
- $crop_h = ceil($new_h / $size_ratio);
</del><ins>+ $crop_w = round($new_w / $size_ratio);
+ $crop_h = round($new_h / $size_ratio);
</ins><span class="cx">
</span><del>- $s_x = floor(($orig_w - $crop_w)/2);
- $s_y = floor(($orig_h - $crop_h)/2);
- }
- else {
</del><ins>+ $s_x = floor( ($orig_w - $crop_w) / 2 );
+ $s_y = floor( ($orig_h - $crop_h) / 2 );
+ } else {
</ins><span class="cx"> // don't crop, just resize using $dest_w x $dest_h as a maximum bounding box
</span><span class="cx"> $crop_w = $orig_w;
</span><span class="cx"> $crop_h = $orig_h;
</span><span class="lines">@@ -299,12 +300,12 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // if the resulting image would be the same size or larger we don't want to resize it
</span><del>- if ($new_w >= $orig_w && $new_h >= $orig_h)
</del><ins>+ if ( $new_w >= $orig_w && $new_h >= $orig_h )
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> // the return array matches the parameters to imagecopyresampled()
</span><span class="cx"> // int dst_x, int dst_y, int src_x, int src_y, int dst_w, int dst_h, int src_w, int src_h
</span><del>- return array(0, 0, $s_x, $s_y, $new_w, $new_h, $crop_w, $crop_h);
</del><ins>+ return array( 0, 0, $s_x, $s_y, $new_w, $new_h, $crop_w, $crop_h );
</ins><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>