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
This commit is contained in:
Adam Silverstein 2024-09-30 23:50:14 +00:00
parent 51c5572f94
commit d3075bb2ff
3 changed files with 1 additions and 34 deletions

View File

@ -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.
*

View File

@ -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 );
}

View File

@ -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.