<!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>[59144] branches/6.5: Revert r59136 from the 6.5 branch, this is intended for trunk.</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/59144">59144</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/59144","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>adamsilverstein</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2024-09-30 23:48:49 +0000 (Mon, 30 Sep 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'>Revert <a href="https://core.trac.wordpress.org/changeset/59136">r59136</a> from the 6.5 branch, this is intended for trunk.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches65srcwpincludesclasswpimageeditorgdphp">branches/6.5/src/wp-includes/class-wp-image-editor-gd.php</a></li>
<li><a href="#branches65srcwpincludesclasswpimageeditorimagickphp">branches/6.5/src/wp-includes/class-wp-image-editor-imagick.php</a></li>
<li><a href="#branches65testsphpunittestsmediaphp">branches/6.5/tests/phpunit/tests/media.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches65srcwpincludesclasswpimageeditorgdphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/6.5/src/wp-includes/class-wp-image-editor-gd.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/6.5/src/wp-includes/class-wp-image-editor-gd.php 2024-09-30 23:27:34 UTC (rev 59143)
+++ branches/6.5/src/wp-includes/class-wp-image-editor-gd.php 2024-09-30 23:48:49 UTC (rev 59144)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -568,38 +568,6 @@
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Sets Image Compression quality on a 1-100% scale. Handles WebP lossless images.
- *
- * @since 6.7.0
- *
- * @param int $quality Compression Quality. Range: [1,100]
- * @return true|WP_Error True if set successfully; WP_Error on failure.
- */
- public function set_quality( $quality = null ) {
- $quality_result = parent::set_quality( $quality );
- if ( is_wp_error( $quality_result ) ) {
- return $quality_result;
- } else {
- $quality = $this->get_quality();
- }
-
- // Handle setting the quality for WebP lossless images, see https://php.watch/versions/8.1/gd-webp-lossless.
- try {
- if ( 'image/webp' === $this->mime_type && defined( 'IMG_WEBP_LOSSLESS' ) ) {
- $webp_info = wp_get_webp_info( $this->file );
- if ( ! empty( $webp_info['type'] ) && 'lossless' === $webp_info['type'] ) {
- $quality = IMG_WEBP_LOSSLESS;
- parent::set_quality( $quality );
- }
- }
- } catch ( Exception $e ) {
- return new WP_Error( 'image_quality_error', $e->getMessage() );
- }
- $this->quality = $quality;
- return true;
- }
-
- /**
</del><span class="cx" style="display: block; padding: 0 10px"> * Returns stream of current image.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.5.0
</span></span></pre></div>
<a id="branches65srcwpincludesclasswpimageeditorimagickphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/6.5/src/wp-includes/class-wp-image-editor-imagick.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/6.5/src/wp-includes/class-wp-image-editor-imagick.php 2024-09-30 23:27:34 UTC (rev 59143)
+++ branches/6.5/src/wp-includes/class-wp-image-editor-imagick.php 2024-09-30 23:48:49 UTC (rev 59144)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -215,7 +215,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Use WebP lossless settings.
</span><span class="cx" style="display: block; padding: 0 10px"> $this->image->setImageCompressionQuality( 100 );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->image->setOption( 'webp:lossless', 'true' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- parent::set_quality( 100 );
</del><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->image->setImageCompressionQuality( $quality );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="branches65testsphpunittestsmediaphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/6.5/tests/phpunit/tests/media.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/6.5/tests/phpunit/tests/media.php 2024-09-30 23:27:34 UTC (rev 59143)
+++ branches/6.5/tests/phpunit/tests/media.php 2024-09-30 23:48:49 UTC (rev 59144)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6081,35 +6081,7 @@
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Test WebP lossless quality is handled correctly.
- *
- * @ticket 60291
- */
- public function test_set_quality_webp_lossless() {
- // Get a new editor to test that lossless WebP images are handled correctly.
- $editor = wp_get_image_editor( DIR_TESTDATA . '/images/webp-lossless.webp' );
-
- // If no editor is available, skip the test.
- if ( is_wp_error( $editor ) ) {
- $this->markTestSkipped( 'No editor available for lossless WebP images.' );
- }
-
- // Only test on GD when WebP lossless is supported.
- if ( 'WP_Image_Editor_GD' === get_class( $editor ) && ! defined( 'IMG_WEBP_LOSSLESS' ) ) {
- $this->markTestSkipped( 'No GD support available for lossless WebP images.' );
- }
-
- // Verify lossless quality is set correctly: IMG_WEBP_LOSSLESS for GD and 100 for Imagick.
- if ( 'WP_Image_Editor_GD' === get_class( $editor ) ) {
- $this->assertSame( IMG_WEBP_LOSSLESS, $editor->get_quality() );
- } else {
- $this->assertSame( 100, $editor->get_quality() );
- }
- }
-
- /**
</del><span class="cx" style="display: block; padding: 0 10px"> * Returns an array with dimension attribute values ineligible for a high priority image.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array Associative array with 'width' and 'height' keys.
</span></span></pre>
</div>
</div>
</body>
</html>