diff --git a/wp-includes/class-wp-image-editor-gd.php b/wp-includes/class-wp-image-editor-gd.php index acb3dd5026..dfa90545f6 100644 --- a/wp-includes/class-wp-image-editor-gd.php +++ b/wp-includes/class-wp-image-editor-gd.php @@ -571,6 +571,38 @@ 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 72b1e42d41..bb3f903120 100644 --- a/wp-includes/class-wp-image-editor-imagick.php +++ b/wp-includes/class-wp-image-editor-imagick.php @@ -215,6 +215,7 @@ 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 1f593cec63..26cdefa907 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -16,7 +16,7 @@ * * @global string $wp_version */ -$wp_version = '6.7-alpha-59143'; +$wp_version = '6.7-alpha-59145'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.