Changeset 59136

Timestamp:

09/30/2024 06:37:05 PM (2 years ago)

Author:

adamsilverstein

Message:

Media: improve support for lossless WebP.

When uploading lossless WebP images, WordPress now correctly outputs lossless WebP with both the Imagick and GD image editors.

Props: adamsilverstein, martinkrcho.
Fixes #60291.

Location:

branches/6.5

Files:

• src/wp-includes/class-wp-image-editor-gd.php (modified) (1 diff)
• src/wp-includes/class-wp-image-editor-imagick.php (modified) (1 diff)
• tests/phpunit/tests/media.php (modified) (1 diff)

branches/6.5/src/wp-includes/class-wp-image-editor-gd.php

@@ -566 +566 @@
                         'filesize'  => wp_filesize( $filename ),
                 );
+        }
+
+        /**
+         * 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;
         }
 

branches/6.5/src/wp-includes/class-wp-image-editor-imagick.php

@@ -216 +216 @@
                                                 $this->image->setImageCompressionQuality( 100 );
                                                 $this->image->setOption( 'webp:lossless', 'true' );
+                                                parent::set_quality( 100 );
                                         } else {
                                                 $this->image->setImageCompressionQuality( $quality );

branches/6.5/tests/phpunit/tests/media.php

@@ -6082 +6082 @@
         }
 
+
+        /**
+         * 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() );
+                }
+        }
+
         /**
          * Returns an array with dimension attribute values ineligible for a high priority image.