<!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>[30660] trunk: Use `round()` instead of `floor()` when resizing image dimensions.</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 { 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/30660">30660</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/30660","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>wonderboymusic</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2014-11-30 19:53:18 +0000 (Sun, 30 Nov 2014)</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'>Use `round()` instead of `floor()` when resizing image dimensions.
Updates unit tests.
Props SergeyBiryukov, kitchin.
Fixes <a href="https://core.trac.wordpress.org/ticket/18532">#18532</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesmediaphp">trunk/src/wp-includes/media.php</a></li>
<li><a href="#trunktestsphpunittestsimageeditor_gdphp">trunk/tests/phpunit/tests/image/editor_gd.php</a></li>
<li><a href="#trunktestsphpunittestsimageeditor_imagickphp">trunk/tests/phpunit/tests/image/editor_imagick.php</a></li>
<li><a href="#trunktestsphpunittestsimageresizephp">trunk/tests/phpunit/tests/image/resize.php</a></li>
<li><a href="#trunktestsphpunittestsimagesizephp">trunk/tests/phpunit/tests/image/size.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesmediaphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/media.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/media.php 2014-11-30 19:17:44 UTC (rev 30659)
+++ trunk/src/wp-includes/media.php 2014-11-30 19:53:18 UTC (rev 30660)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -379,26 +379,33 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $smaller_ratio = min( $width_ratio, $height_ratio );
</span><span class="cx" style="display: block; padding: 0 10px"> $larger_ratio = max( $width_ratio, $height_ratio );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( intval( $current_width * $larger_ratio ) > $max_width || intval( $current_height * $larger_ratio ) > $max_height )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( (int) round( $current_width * $larger_ratio ) > $max_width || (int) round( $current_height * $larger_ratio ) > $max_height ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // The larger ratio is too big. It would result in an overflow.
</span><span class="cx" style="display: block; padding: 0 10px"> $ratio = $smaller_ratio;
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- else
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } else {
</ins><span class="cx" style="display: block; padding: 0 10px"> // The larger ratio fits, and is likely to be a more "snug" fit.
</span><span class="cx" style="display: block; padding: 0 10px"> $ratio = $larger_ratio;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Very small dimensions may result in 0, 1 should be the minimum.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $w = max ( 1, intval( $current_width * $ratio ) );
- $h = max ( 1, intval( $current_height * $ratio ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $w = max ( 1, (int) round( $current_width * $ratio ) );
+ $h = max ( 1, (int) round( $current_height * $ratio ) );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Sometimes, due to rounding, we'll end up with a result like this: 465x700 in a 177x177 box is 117x176... a pixel short
</span><span class="cx" style="display: block; padding: 0 10px"> // We also have issues with recursive calls resulting in an ever-changing result. Constraining to the result of a constraint should yield the original result.
</span><span class="cx" style="display: block; padding: 0 10px"> // Thus we look for dimensions that are one pixel shy of the max value and bump them up
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $did_width && $w == $max_width - 1 )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ // Note: $did_width means it is possible $smaller_ratio == $width_ratio.
+ if ( $did_width && $w == $max_width - 1 ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $w = $max_width; // Round it up
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $did_height && $h == $max_height - 1 )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
+
+ // Note: $did_height means it is possible $smaller_ratio == $height_ratio.
+ if ( $did_height && $h == $max_height - 1 ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $h = $max_height; // Round it up
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return array( $w, $h );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return apply_filters( 'wp_constrain_dimensions', array( $w, $h ), $current_width, $current_height, $max_width, $max_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"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -459,12 +466,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $new_w = min($dest_w, $orig_w);
</span><span class="cx" style="display: block; padding: 0 10px"> $new_h = min($dest_h, $orig_h);
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( !$new_w ) {
- $new_w = intval($new_h * $aspect_ratio);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! $new_w ) {
+ $new_w = (int) round( $new_h * $aspect_ratio );
</ins><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">- if ( !$new_h ) {
- $new_h = intval($new_w / $aspect_ratio);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! $new_h ) {
+ $new_h = (int) round( $new_w / $aspect_ratio );
</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"> $size_ratio = max($new_w / $orig_w, $new_h / $orig_h);
</span></span></pre></div>
<a id="trunktestsphpunittestsimageeditor_gdphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/image/editor_gd.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/image/editor_gd.php 2014-11-30 19:17:44 UTC (rev 30659)
+++ trunk/tests/phpunit/tests/image/editor_gd.php 2014-11-30 19:53:18 UTC (rev 30660)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -282,9 +282,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // #0
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'file' => 'waffles-10x6.jpg',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'file' => 'waffles-10x7.jpg',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'width' => 10,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'height' => 6,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'height' => 7,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'mime-type' => 'image/jpeg',
</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">@@ -322,16 +322,16 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // #5
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'file' => 'waffles-55x36.jpg',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'file' => 'waffles-55x37.jpg',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'width' => 55,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'height' => 36,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'height' => 37,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'mime-type' => 'image/jpeg',
</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"> // #6
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'file' => 'waffles-82x55.jpg',
- 'width' => 82,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'file' => 'waffles-83x55.jpg',
+ 'width' => 83,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'height' => 55,
</span><span class="cx" style="display: block; padding: 0 10px"> 'mime-type' => 'image/jpeg',
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span></span></pre></div>
<a id="trunktestsphpunittestsimageeditor_imagickphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/image/editor_imagick.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/image/editor_imagick.php 2014-11-30 19:17:44 UTC (rev 30659)
+++ trunk/tests/phpunit/tests/image/editor_imagick.php 2014-11-30 19:53:18 UTC (rev 30660)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -282,9 +282,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // #0
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'file' => 'waffles-10x6.jpg',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'file' => 'waffles-10x7.jpg',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'width' => 10,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'height' => 6,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'height' => 7,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'mime-type' => 'image/jpeg',
</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">@@ -322,16 +322,16 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // #5
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'file' => 'waffles-55x36.jpg',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'file' => 'waffles-55x37.jpg',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'width' => 55,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'height' => 36,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'height' => 37,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'mime-type' => 'image/jpeg',
</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"> // #6
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'file' => 'waffles-82x55.jpg',
- 'width' => 82,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'file' => 'waffles-83x55.jpg',
+ 'width' => 83,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'height' => 55,
</span><span class="cx" style="display: block; padding: 0 10px"> 'mime-type' => 'image/jpeg',
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span></span></pre></div>
<a id="trunktestsphpunittestsimageresizephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/image/resize.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/image/resize.php 2014-11-30 19:17:44 UTC (rev 30659)
+++ trunk/tests/phpunit/tests/image/resize.php 2014-11-30 19:53:18 UTC (rev 30660)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -13,7 +13,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_resize_jpg() {
</span><span class="cx" style="display: block; padding: 0 10px"> $image = $this->resize_helper( DIR_TESTDATA.'/images/test-image.jpg', 25, 25 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( 'test-image-25x25.jpg', basename($image) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals( 'test-image-25x25.jpg', basename( $image ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> list($w, $h, $type) = getimagesize($image);
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 25, $w );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 25, $h );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -25,7 +25,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_resize_png() {
</span><span class="cx" style="display: block; padding: 0 10px"> $image = $this->resize_helper( DIR_TESTDATA.'/images/test-image.png', 25, 25 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( 'test-image-25x25.png', basename($image) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! is_string( $image ) ) { // WP_Error, stop GLib-GObject-CRITICAL assertion
+ $this->markTestSkipped( sprintf( 'No PNG support in the editor engine %s on this system', $this->editor_engine ) );
+ return;
+ }
+
+ $this->assertEquals( 'test-image-25x25.png', basename( $image ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> list($w, $h, $type) = getimagesize($image);
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 25, $w );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 25, $h );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -37,7 +42,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_resize_gif() {
</span><span class="cx" style="display: block; padding: 0 10px"> $image = $this->resize_helper( DIR_TESTDATA.'/images/test-image.gif', 25, 25 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( 'test-image-25x25.gif', basename($image) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! is_string( $image ) ) { // WP_Error, stop GLib-GObject-CRITICAL assertion
+ $this->markTestSkipped( sprintf( 'No GIF support in the editor engine %s on this system', $this->editor_engine ) );
+ return;
+ }
+
+ $this->assertEquals( 'test-image-25x25.gif', basename( $image ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> list($w, $h, $type) = getimagesize($image);
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 25, $w );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 25, $h );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -57,9 +67,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_resize_thumb_128x96() {
</span><span class="cx" style="display: block; padding: 0 10px"> $image = $this->resize_helper( DIR_TESTDATA.'/images/2007-06-17DSC_4173.JPG', 128, 96 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( '2007-06-17DSC_4173-63x96.jpg', basename($image) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals( '2007-06-17DSC_4173-64x96.jpg', basename( $image ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> list($w, $h, $type) = getimagesize($image);
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( 63, $w );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals( 64, $w );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 96, $h );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( IMAGETYPE_JPEG, $type );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -69,10 +79,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_resize_thumb_128x0() {
</span><span class="cx" style="display: block; padding: 0 10px"> $image = $this->resize_helper( DIR_TESTDATA.'/images/2007-06-17DSC_4173.JPG', 128, 0 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( '2007-06-17DSC_4173-128x192.jpg', basename($image) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals( '2007-06-17DSC_4173-128x193.jpg', basename( $image ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> list($w, $h, $type) = getimagesize($image);
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 128, $w );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( 192, $h );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals( 193, $h );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( IMAGETYPE_JPEG, $type );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> unlink( $image );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -81,9 +91,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_resize_thumb_0x96() {
</span><span class="cx" style="display: block; padding: 0 10px"> $image = $this->resize_helper( DIR_TESTDATA.'/images/2007-06-17DSC_4173.JPG', 0, 96 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( '2007-06-17DSC_4173-63x96.jpg', basename($image) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals( '2007-06-17DSC_4173-64x96.jpg', basename( $image ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> list($w, $h, $type) = getimagesize($image);
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( 63, $w );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals( 64, $w );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 96, $h );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( IMAGETYPE_JPEG, $type );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -93,7 +103,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_resize_thumb_150x150_crop() {
</span><span class="cx" style="display: block; padding: 0 10px"> $image = $this->resize_helper( DIR_TESTDATA.'/images/2007-06-17DSC_4173.JPG', 150, 150, true );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( '2007-06-17DSC_4173-150x150.jpg', basename($image) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals( '2007-06-17DSC_4173-150x150.jpg', basename( $image ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> list($w, $h, $type) = getimagesize($image);
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 150, $w );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 150, $h );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -105,7 +115,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_resize_thumb_150x100_crop() {
</span><span class="cx" style="display: block; padding: 0 10px"> $image = $this->resize_helper( DIR_TESTDATA.'/images/2007-06-17DSC_4173.JPG', 150, 100, true );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( '2007-06-17DSC_4173-150x100.jpg', basename($image) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals( '2007-06-17DSC_4173-150x100.jpg', basename( $image ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> list($w, $h, $type) = getimagesize($image);
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 150, $w );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 100, $h );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -117,7 +127,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_resize_thumb_50x150_crop() {
</span><span class="cx" style="display: block; padding: 0 10px"> $image = $this->resize_helper( DIR_TESTDATA.'/images/2007-06-17DSC_4173.JPG', 50, 150, true );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals( '2007-06-17DSC_4173-50x150.jpg', basename($image) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertEquals( '2007-06-17DSC_4173-50x150.jpg', basename( $image ) );
</ins><span class="cx" style="display: block; padding: 0 10px"> list($w, $h, $type) = getimagesize($image);
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 50, $w );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 150, $h );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -142,6 +152,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 6821
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_resize_bad_image() {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ if ( $this->editor_engine == 'WP_Image_Editor_Imagick' ) {
+ $this->markTestSkipped( sprintf( 'Avoid GLib-GObject-CRITICAL assertion in %s', $this->editor_engine ) );
+ return;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $image = $this->resize_helper( DIR_TESTDATA.'/export/crazy-cdata.xml', 25, 25 );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertInstanceOf( 'WP_Error', $image );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEquals( 'invalid_image', $image->get_error_code() );
</span></span></pre></div>
<a id="trunktestsphpunittestsimagesizephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/image/size.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/image/size.php 2014-11-30 19:17:44 UTC (rev 30659)
+++ trunk/tests/phpunit/tests/image/size.php 2014-11-30 19:53:18 UTC (rev 30660)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -13,13 +13,16 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // no constraint - should have no effect
</span><span class="cx" style="display: block; padding: 0 10px"> $out = wp_constrain_dimensions(640, 480, 0, 0);
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals(array(640, 480), $out);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( array( 640, 480 ), $out );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $out = wp_constrain_dimensions(640, 480);
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals(array(640, 480), $out);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( array( 640, 480 ), $out );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $out = wp_constrain_dimensions(0, 0, 0, 0);
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals(array(0, 0), $out);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( array( 0, 0 ), $out );
+
+ $out = wp_constrain_dimensions(465, 700, 177, 177);
+ $this->assertSame( array( 118, 177 ), $out );
</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"> function test_constrain_dims_smaller() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -28,13 +31,13 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // image size is smaller than the constraint - no effect
</span><span class="cx" style="display: block; padding: 0 10px"> $out = wp_constrain_dimensions(500, 600, 1024, 768);
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals(array(500, 600), $out);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( array( 500, 600 ), $out );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $out = wp_constrain_dimensions(500, 600, 0, 768);
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals(array(500, 600), $out);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( array( 500, 600 ), $out );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $out = wp_constrain_dimensions(500, 600, 1024, 0);
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals(array(500, 600), $out);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( array( 500, 600 ), $out );
</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"> function test_constrain_dims_equal() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -43,13 +46,13 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // image size is equal to the constraint - no effect
</span><span class="cx" style="display: block; padding: 0 10px"> $out = wp_constrain_dimensions(1024, 768, 1024, 768);
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertequals(array(1024, 768), $out);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( array( 1024, 768 ), $out );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $out = wp_constrain_dimensions(1024, 768, 0, 768);
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertequals(array(1024, 768), $out);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( array( 1024, 768 ), $out );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $out = wp_constrain_dimensions(1024, 768, 1024, 0);
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertequals(array(1024, 768), $out);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( array( 1024, 768 ), $out );
</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"> function test_constrain_dims_larger() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -58,23 +61,23 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // image size is larger than the constraint - result should be constrained
</span><span class="cx" style="display: block; padding: 0 10px"> $out = wp_constrain_dimensions(1024, 768, 500, 600);
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertequals(array(500, 375), $out);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( array( 500, 375 ), $out );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $out = wp_constrain_dimensions(1024, 768, 0, 600);
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertequals(array(800, 600), $out);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( array( 800, 600 ), $out );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $out = wp_constrain_dimensions(1024, 768, 500, 0);
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertequals(array(500, 375), $out);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( array( 500, 375 ), $out );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // also try a portrait oriented image
</span><span class="cx" style="display: block; padding: 0 10px"> $out = wp_constrain_dimensions(300, 800, 500, 600);
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertequals(array(225, 600), $out);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( array( 225, 600 ), $out );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $out = wp_constrain_dimensions(300, 800, 0, 600);
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertequals(array(225, 600), $out);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( array( 225, 600 ), $out );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $out = wp_constrain_dimensions(300, 800, 200, 0);
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertequals(array(200, 533), $out);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( array( 200, 533 ), $out );
</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"> function test_constrain_dims_boundary() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -83,17 +86,17 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // one dimension is larger than the constraint, one smaller - result should be constrained
</span><span class="cx" style="display: block; padding: 0 10px"> $out = wp_constrain_dimensions(1024, 768, 500, 800);
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertequals(array(500, 375), $out);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( array( 500, 375 ), $out );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $out = wp_constrain_dimensions(1024, 768, 2000, 700);
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertequals(array(933, 700), $out);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( array( 933, 700 ), $out );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // portrait
</span><span class="cx" style="display: block; padding: 0 10px"> $out = wp_constrain_dimensions(768, 1024, 800, 500);
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertequals(array(375, 500), $out);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( array( 375, 500 ), $out );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $out = wp_constrain_dimensions(768, 1024, 2000, 700);
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertequals(array(525, 700), $out);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( array( 525, 700 ), $out );
</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">@@ -101,10 +104,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function test_shrink_dimensions_default() {
</span><span class="cx" style="display: block; padding: 0 10px"> $out = wp_shrink_dimensions(640, 480);
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals(array(128, 96), $out);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( array( 128, 96 ), $out );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $out = wp_shrink_dimensions(480, 640);
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals(array(72, 96), $out);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( array( 72, 96 ), $out );
</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">@@ -113,10 +116,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_shrink_dimensions_smaller() {
</span><span class="cx" style="display: block; padding: 0 10px"> // image size is smaller than the constraint - no effect
</span><span class="cx" style="display: block; padding: 0 10px"> $out = wp_shrink_dimensions(500, 600, 1024, 768);
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals(array(500, 600), $out);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( array( 500, 600 ), $out );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $out = wp_shrink_dimensions(600, 500, 1024, 768);
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals(array(600, 500), $out);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( array( 600, 500 ), $out );
</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">@@ -125,10 +128,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_shrink_dimensions_equal() {
</span><span class="cx" style="display: block; padding: 0 10px"> // image size is equal to the constraint - no effect
</span><span class="cx" style="display: block; padding: 0 10px"> $out = wp_shrink_dimensions(500, 600, 500, 600);
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals(array(500, 600), $out);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( array( 500, 600 ), $out );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $out = wp_shrink_dimensions(600, 500, 600, 500);
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals(array(600, 500), $out);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( array( 600, 500 ), $out );
</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">@@ -137,10 +140,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_shrink_dimensions_larger() {
</span><span class="cx" style="display: block; padding: 0 10px"> // image size is larger than the constraint - result should be constrained
</span><span class="cx" style="display: block; padding: 0 10px"> $out = wp_shrink_dimensions(1024, 768, 500, 600);
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertequals(array(500, 375), $out);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( array( 500, 375 ), $out );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $out = wp_shrink_dimensions(300, 800, 500, 600);
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertequals(array(225, 600), $out);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( array( 225, 600 ), $out );
</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">@@ -149,25 +152,25 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function test_shrink_dimensions_boundary() {
</span><span class="cx" style="display: block; padding: 0 10px"> // one dimension is larger than the constraint, one smaller - result should be constrained
</span><span class="cx" style="display: block; padding: 0 10px"> $out = wp_shrink_dimensions(1024, 768, 500, 800);
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertequals(array(500, 375), $out);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( array( 500, 375 ), $out );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $out = wp_shrink_dimensions(1024, 768, 2000, 700);
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertequals(array(933, 700), $out);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( array( 933, 700 ), $out );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // portrait
</span><span class="cx" style="display: block; padding: 0 10px"> $out = wp_shrink_dimensions(768, 1024, 800, 500);
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertequals(array(375, 500), $out);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( array( 375, 500 ), $out );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $out = wp_shrink_dimensions(768, 1024, 2000, 700);
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertequals(array(525, 700), $out);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( array( 525, 700 ), $out );
</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"> function test_constrain_size_for_editor_thumb() {
</span><span class="cx" style="display: block; padding: 0 10px"> $out = image_constrain_size_for_editor(600, 400, 'thumb');
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals(array(150, 100), $out);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( array( 150, 100 ), $out );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $out = image_constrain_size_for_editor(64, 64, 'thumb');
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals(array(64, 64), $out);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( array( 64, 64 ), $out );
</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"> function test_constrain_size_for_editor_medium() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -181,18 +184,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> update_option('medium_size_h', 0);
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $out = image_constrain_size_for_editor(600, 400, 'medium');
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals(array(500, 333), $out);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( array( 500, 333 ), $out );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $out = image_constrain_size_for_editor(400, 600, 'medium');
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals(array(400, 600), $out);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( array( 400, 600 ), $out );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $out = image_constrain_size_for_editor(64, 64, 'medium');
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals(array(64, 64), $out);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( array( 64, 64 ), $out );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // content_width should be ignored
</span><span class="cx" style="display: block; padding: 0 10px"> $content_width = 350;
</span><span class="cx" style="display: block; padding: 0 10px"> $out = image_constrain_size_for_editor(600, 400, 'medium');
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals(array(500, 333), $out);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( array( 500, 333 ), $out );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $content_width = $_content_width;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -204,19 +207,19 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $content_width = 400;
</span><span class="cx" style="display: block; padding: 0 10px"> $out = image_constrain_size_for_editor(600, 400, 'full');
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals(array(600, 400), $out);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( array( 600, 400 ), $out );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $out = image_constrain_size_for_editor(64, 64, 'full');
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals(array(64, 64), $out);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( array( 64, 64 ), $out );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // content_width default is 500
</span><span class="cx" style="display: block; padding: 0 10px"> $content_width = 0;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $out = image_constrain_size_for_editor(600, 400, 'full');
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals(array(600, 400), $out);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( array( 600, 400 ), $out );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $out = image_constrain_size_for_editor(64, 64, 'full');
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertEquals(array(64, 64), $out);
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( array( 64, 64 ), $out );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $content_width = $_content_width;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>