
<!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>[12447] branches/2.9/wp-admin/includes/image-edit.php:

  Fix the scale image check in image editor, fixes #11473 for 2.9</title>

</head>

<body>


<div id="msg">

<dl>

<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/12447">12447</a></dd>

<dt>Author</dt> <dd>azaozz</dd>

<dt>Date</dt> <dd>2009-12-18 09:53:46 +0000 (Fri, 18 Dec 2009)</dd>

</dl>


<h3>Log Message</h3>

<pre>Fix the scale image check in image editor, fixes <a href="http://trac.wordpress.org/ticket/11473">#11473</a> for 2.9</pre>


<h3>Modified Paths</h3>

<ul>

<li><a href="#branches29wpadminincludesimageeditphp">branches/2.9/wp-admin/includes/image-edit.php</a></li>

</ul>


</div>

<div id="patch">

<h3>Diff</h3>

<a id="branches29wpadminincludesimageeditphp"></a>

<div class="modfile"><h4>Modified: branches/2.9/wp-admin/includes/image-edit.php (12446 => 12447)</h4>

<pre class="diff"><span>

<span class="info">--- branches/2.9/wp-admin/includes/image-edit.php        2009-12-18 09:52:32 UTC (rev 12446)

+++ branches/2.9/wp-admin/includes/image-edit.php        2009-12-18 09:53:46 UTC (rev 12447)

</span><span class="lines">@@ -509,7 +509,8 @@

</span><span class="cx">                 $sY = imagesy($img);

</span><span class="cx"> 

</span><span class="cx">                 // check if it has roughly the same w / h ratio

</span><del>-                if ( round($sX / $sY, 2) == round($fwidth / $fheight, 2) ) {

</del><ins>+                $diff = round($sX / $sY, 2) - round($fwidth / $fheight, 2);

+                if ( -0.1 &lt; $diff &amp;&amp; $diff &lt; 0.1 ) {

</ins><span class="cx">                         // scale the full size image

</span><span class="cx">                         $dst = wp_imagecreatetruecolor($fwidth, $fheight);

</span><span class="cx">                         if ( imagecopyresampled( $dst, $img, 0, 0, 0, 0, $fwidth, $fheight, $sX, $sY ) ) {

</span></span></pre>

</div>

</div>


</body>

</html>