<!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" />
<title>[58915] trunk/src: Media: Fix admin image cropping calculations.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { 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 { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#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>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/58915">58915</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/58915","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>joedolson</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2024-08-19 20:45:33 +0000 (Mon, 19 Aug 2024)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Media: Fix admin image cropping calculations.
The admin image editor crop function introduced rounding errors by using a scaled image to calculate values. Fix uses the image at 100% scale for calculations. Also avoid recalculating selection when the selection position is changed, and prevent incorrect values after scaling or restoration.
Previously committed in <a href="https://core.trac.wordpress.org/changeset/58456">[58456]</a> and reverted in <a href="https://core.trac.wordpress.org/changeset/58571">[58571]</a>. The revert was due to a misattributed test failure.
Props Jossnaz, johnillo, shailu25, rachelbaker, sudipatel007, joedolson, kevin940726 , andrewserong, hmbashar.
Fixes <a href="https://core.trac.wordpress.org/ticket/32282">#32282</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcjs_enqueueslibimageeditjs">trunk/src/js/_enqueues/lib/image-edit.js</a></li>
<li><a href="#trunksrcwpadminincludesimageeditphp">trunk/src/wp-admin/includes/image-edit.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcjs_enqueueslibimageeditjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/_enqueues/lib/image-edit.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/_enqueues/lib/image-edit.js 2024-08-19 19:17:42 UTC (rev 58914)
+++ trunk/src/js/_enqueues/lib/image-edit.js 2024-08-19 20:45:33 UTC (rev 58915)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -143,17 +143,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return {void}
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> init : function(postid) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var t = this, old = $('#image-editor-' + t.postid),
- x = t.intval( $('#imgedit-x-' + postid).val() ),
- y = t.intval( $('#imgedit-y-' + postid).val() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var t = this, old = $('#image-editor-' + t.postid);
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( t.postid !== postid && old.length ) {
</span><span class="cx" style="display: block; padding: 0 10px"> t.close(t.postid);
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- t.hold.w = t.hold.ow = x;
- t.hold.h = t.hold.oh = y;
- t.hold.xy_ratio = x / y;
</del><span class="cx" style="display: block; padding: 0 10px"> t.hold.sizer = parseFloat( $('#imgedit-sizer-' + postid).val() );
</span><span class="cx" style="display: block; padding: 0 10px"> t.postid = postid;
</span><span class="cx" style="display: block; padding: 0 10px"> $('#imgedit-response-' + postid).empty();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -189,6 +184,29 @@
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Calculate the image size and save it to memory.
+ *
+ * @since 6.7.0
+ *
+ * @memberof imageEdit
+ *
+ * @param {number} postid The post ID.
+ *
+ * @return {void}
+ */
+ calculateImgSize: function( postid ) {
+ var t = this,
+ x = t.intval( $( '#imgedit-x-' + postid ).val() ),
+ y = t.intval( $( '#imgedit-y-' + postid ).val() );
+
+ t.hold.w = t.hold.ow = x;
+ t.hold.h = t.hold.oh = y;
+ t.hold.xy_ratio = x / y;
+ t.hold.sizer = parseFloat( $( '#imgedit-sizer-' + postid ).val() );
+ t.currentCropSelection = null;
+ },
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Toggles the wait/load icon in the editor.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.9.0
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -525,7 +543,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> for ( n in history ) {
</span><span class="cx" style="display: block; padding: 0 10px"> i = history[n];
</span><span class="cx" style="display: block; padding: 0 10px"> if ( i.hasOwnProperty('c') ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- op[n] = { 'c': { 'x': i.c.x, 'y': i.c.y, 'w': i.c.w, 'h': i.c.h } };
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ op[n] = { 'c': { 'x': i.c.x, 'y': i.c.y, 'w': i.c.w, 'h': i.c.h, 'r': i.c.r } };
</ins><span class="cx" style="display: block; padding: 0 10px"> } else if ( i.hasOwnProperty('r') ) {
</span><span class="cx" style="display: block; padding: 0 10px"> op[n] = { 'r': i.r.r };
</span><span class="cx" style="display: block; padding: 0 10px"> } else if ( i.hasOwnProperty('f') ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -860,6 +878,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'undefined' === typeof this.hold.sizer ) {
</span><span class="cx" style="display: block; padding: 0 10px"> this.init( postid );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ this.calculateImgSize( postid );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> this.initCrop(postid, img, parent);
</span><span class="cx" style="display: block; padding: 0 10px"> this.setCropSelection( postid, { 'x1': 0, 'y1': 0, 'x2': 0, 'y2': 0, 'width': img.innerWidth(), 'height': img.innerHeight() } );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -909,8 +928,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> var t = this,
</span><span class="cx" style="display: block; padding: 0 10px"> selW = $('#imgedit-sel-width-' + postid),
</span><span class="cx" style="display: block; padding: 0 10px"> selH = $('#imgedit-sel-height-' + postid),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- selX = $('#imgedit-start-x-' + postid),
- selY = $('#imgedit-start-y-' + postid),
</del><span class="cx" style="display: block; padding: 0 10px"> $image = $( image ),
</span><span class="cx" style="display: block; padding: 0 10px"> $img;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -945,13 +962,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @return {void}
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- parent.children().on( 'mousedown, touchstart', function(e){
- var ratio = false, sel, defRatio;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ parent.children().on( 'mousedown touchstart', function(e) {
+ var ratio = false,
+ sel = t.iasapi.getSelection(),
+ cx = t.intval( $( '#imgedit-crop-width-' + postid ).val() ),
+ cy = t.intval( $( '#imgedit-crop-height-' + postid ).val() );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( e.shiftKey ) {
- sel = t.iasapi.getSelection();
- defRatio = t.getSelRatio(postid);
- ratio = ( sel && sel.width && sel.height ) ? sel.width + ':' + sel.height : defRatio;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( cx && cy ) {
+ ratio = t.getSelRatio( postid );
+ } else if ( e.shiftKey && sel && sel.width && sel.height ) {
+ ratio = sel.width + ':' + sel.height;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> t.iasapi.setOptions({
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1000,11 +1020,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return {void}
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> onSelectChange: function(img, c) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var sizer = imageEdit.hold.sizer;
- selW.val( imageEdit.round(c.width / sizer) );
- selH.val( imageEdit.round(c.height / sizer) );
- selX.val( imageEdit.round(c.x1 / sizer) );
- selY.val( imageEdit.round(c.y1 / sizer) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var sizer = imageEdit.hold.sizer,
+ oldSel = imageEdit.currentCropSelection;
+
+ if ( oldSel != null && oldSel.width == c.width && oldSel.height == c.height ) {
+ return;
+ }
+
+ selW.val( Math.min( imageEdit.hold.w, imageEdit.round( c.width / sizer ) ) );
+ selH.val( Math.min( imageEdit.hold.h, imageEdit.round( c.height / sizer ) ) );
+
+ t.currentCropSelection = c;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1022,7 +1048,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return {boolean}
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> setCropSelection : function(postid, c) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var sel;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var sel,
+ selW = $( '#imgedit-sel-width-' + postid ),
+ selH = $( '#imgedit-sel-height-' + postid ),
+ sizer = this.hold.sizer,
+ hold = this.hold;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> c = c || 0;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1037,7 +1067,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- sel = { 'x': c.x1, 'y': c.y1, 'w': c.width, 'h': c.height };
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // adjust the selection within the bounds of the image on 100% scale
+ var excessW = hold.w - ( Math.round( c.x1 / sizer ) + parseInt( selW.val() ) );
+ var excessH = hold.h - ( Math.round( c.y1 / sizer ) + parseInt( selH.val() ) );
+ var x = Math.round( c.x1 / sizer ) + Math.min( 0, excessW );
+ var y = Math.round( c.y1 / sizer ) + Math.min( 0, excessH );
+
+ // use 100% scaling to prevent rounding errors
+ sel = { 'r': 1, 'x': x, 'y': y, 'w': selW.val(), 'h': selH.val() };
+
</ins><span class="cx" style="display: block; padding: 0 10px"> this.setDisabled($('.imgedit-crop', '#imgedit-panel-' + postid), 1);
</span><span class="cx" style="display: block; padding: 0 10px"> $('#imgedit-selection-' + postid).val( JSON.stringify(sel) );
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1165,6 +1203,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> this.closePopup(t);
</span><span class="cx" style="display: block; padding: 0 10px"> this.addStep({ 'r': { 'r': angle, 'fw': this.hold.h, 'fh': this.hold.w }}, postid, nonce);
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ // Clear the selection fields after rotating.
+ $( '#imgedit-sel-width-' + postid ).val( '' );
+ $( '#imgedit-sel-height-' + postid ).val( '' );
+ this.currentCropSelection = null;
</ins><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1187,6 +1230,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> this.closePopup(t);
</span><span class="cx" style="display: block; padding: 0 10px"> this.addStep({ 'f': { 'f': axis, 'fw': this.hold.w, 'fh': this.hold.h }}, postid, nonce);
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ // Clear the selection fields after flipping.
+ $( '#imgedit-sel-width-' + postid ).val( '' );
+ $( '#imgedit-sel-height-' + postid ).val( '' );
+ this.currentCropSelection = null;
</ins><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1219,10 +1267,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Clear the selection fields after cropping.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $('#imgedit-sel-width-' + postid).val('');
- $('#imgedit-sel-height-' + postid).val('');
- $('#imgedit-start-x-' + postid).val('0');
- $('#imgedit-start-y-' + postid).val('0');
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $( '#imgedit-sel-width-' + postid ).val( '' );
+ $( '#imgedit-sel-height-' + postid ).val( '' );
+ $( '#imgedit-start-x-' + postid ).val( '0' );
+ $( '#imgedit-start-y-' + postid ).val( '0' );
+ this.currentCropSelection = null;
</ins><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1312,6 +1361,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> img = $('#image-preview-' + postid), imgh = img.height(), imgw = img.width(),
</span><span class="cx" style="display: block; padding: 0 10px"> sizer = this.hold.sizer, x1, y1, x2, y2, ias = this.iasapi;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ this.currentCropSelection = null;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( false === this.validateNumeric( el ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1335,18 +1386,19 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( x2 > imgw ) {
</span><span class="cx" style="display: block; padding: 0 10px"> x1 = 0;
</span><span class="cx" style="display: block; padding: 0 10px"> x2 = imgw;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- elX.val( Math.round( x2 / sizer ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ elX.val( Math.min( this.hold.w, Math.round( x2 / sizer ) ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( y2 > imgh ) {
</span><span class="cx" style="display: block; padding: 0 10px"> y1 = 0;
</span><span class="cx" style="display: block; padding: 0 10px"> y2 = imgh;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- elY.val( Math.round( y2 / sizer ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ elY.val( Math.min( this.hold.h, Math.round( y2 / sizer ) ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> ias.setSelection( x1, y1, x2, y2 );
</span><span class="cx" style="display: block; padding: 0 10px"> ias.update();
</span><span class="cx" style="display: block; padding: 0 10px"> this.setCropSelection(postid, ias.getSelection());
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ this.currentCropSelection = ias.getSelection();
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpadminincludesimageeditphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/image-edit.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/image-edit.php 2024-08-19 19:17:42 UTC (rev 58914)
+++ trunk/src/wp-admin/includes/image-edit.php 2024-08-19 20:45:33 UTC (rev 58915)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -735,10 +735,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $w = $size['width'];
</span><span class="cx" style="display: block; padding: 0 10px"> $h = $size['height'];
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $scale = 1 / _image_get_preview_ratio( $w, $h ); // Discard preview scaling.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $scale = isset( $sel->r ) ? $sel->r : 1 / _image_get_preview_ratio( $w, $h ); // Discard preview scaling.
</ins><span class="cx" style="display: block; padding: 0 10px"> $image->crop( (int) ( $sel->x * $scale ), (int) ( $sel->y * $scale ), (int) ( $sel->w * $scale ), (int) ( $sel->h * $scale ) );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $scale = 1 / _image_get_preview_ratio( imagesx( $image ), imagesy( $image ) ); // Discard preview scaling.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $scale = isset( $sel->r ) ? $sel->r : 1 / _image_get_preview_ratio( imagesx( $image ), imagesy( $image ) ); // Discard preview scaling.
</ins><span class="cx" style="display: block; padding: 0 10px"> $image = _crop_image_resource( $image, $sel->x * $scale, $sel->y * $scale, $sel->w * $scale, $sel->h * $scale );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span></span></pre>
</div>
</div>
</body>
</html>