From d3075bb2ff4cf836c652bc690fc5e0997e41d712 Mon Sep 17 00:00:00 2001
From: Adam Silverstein <adamsilverstein@earthboundhosting.com>
Date: Mon, 30 Sep 2024 23:50:14 +0000
Subject: [PATCH] Revert r59136 from the 6.5 branch, this is intended for
 trunk.

Built from https://develop.svn.wordpress.org/branches/6.5@59144


git-svn-id: http://core.svn.wordpress.org/branches/6.5@58540 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-includes/class-wp-image-editor-gd.php      | 32 -------------------
 wp-includes/class-wp-image-editor-imagick.php |  1 -
 wp-includes/version.php                       |  2 +-
 3 files changed, 1 insertion(+), 34 deletions(-)

diff --git a/wp-includes/class-wp-image-editor-gd.php b/wp-includes/class-wp-image-editor-gd.php
index cbc33007b9..cbfa6dba38 100644
--- a/wp-includes/class-wp-image-editor-gd.php
+++ b/wp-includes/class-wp-image-editor-gd.php
@@ -567,38 +567,6 @@ class WP_Image_Editor_GD extends WP_Image_Editor {
 		);
 	}
 
-	/**
-	 * 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;
-	}
-
 	/**
 	 * Returns stream of current image.
 	 *
diff --git a/wp-includes/class-wp-image-editor-imagick.php b/wp-includes/class-wp-image-editor-imagick.php
index bbac4c8fca..5de01d7322 100644
--- a/wp-includes/class-wp-image-editor-imagick.php
+++ b/wp-includes/class-wp-image-editor-imagick.php
@@ -215,7 +215,6 @@ class WP_Image_Editor_Imagick extends WP_Image_Editor {
 						// Use WebP lossless settings.
 						$this->image->setImageCompressionQuality( 100 );
 						$this->image->setOption( 'webp:lossless', 'true' );
-						parent::set_quality( 100 );
 					} else {
 						$this->image->setImageCompressionQuality( $quality );
 					}
diff --git a/wp-includes/version.php b/wp-includes/version.php
index c722e169cb..f5597b7777 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -16,7 +16,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '6.5.6-alpha-59136';
+$wp_version = '6.5.6-alpha-59144';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.