Changeset 50810 for trunk/src/wp-includes/class-wp-image-editor-gd.php

Timestamp:

05/04/2021 02:43:36 PM (7 months ago)

Author:

adamsilverstein

Message:

Images: enable WebP support.

Add support for uploading, editing and saving WebP images when supported by the server.

Add 'image/webp' to supported mime types. Correctly identify WebP images and sizes even when PHP doesn't support WebP. Resize uploaded WebP files (when supported) and use for front end markup.

Props markoheijne, blobfolio, Clorith, joemcgill, atjn, desrosj, spacedmonkey, marylauc, mikeschroder, hellofromtonya, flixos90.
Fixes #35725.

File:

• trunk/src/wp-includes/class-wp-image-editor-gd.php (modified) (4 diffs)

trunk/src/wp-includes/class-wp-image-editor-gd.php

@@ -70 +70 @@
             case 'image/gif':
                 return ( $image_types & IMG_GIF ) != 0;
+            case 'image/webp':
+                return ( $image_types & IMG_WEBP ) != 0; // phpcs:ignore PHPCompatibility.Constants.NewConstants.img_webpFound
         }
 
@@ -100 +102 @@
         }
 
-        $this->image = @imagecreatefromstring( $file_contents );
+        // WebP may not work with imagecreatefromstring().
+        if (
+            function_exists( 'imagecreatefromwebp' ) &&
+            ( 'image/webp' === wp_get_image_mime( $this->file ) )
+        ) {
+            $this->image = @imagecreatefromwebp( $this->file );
+        } else {
+            $this->image = @imagecreatefromstring( $file_contents );
+        }
 
         if ( ! is_gd_image( $this->image ) ) {
@@ -458 +468 @@
         } elseif ( 'image/jpeg' === $mime_type ) {
             if ( ! $this->make_image( $filename, 'imagejpeg', array( $image, $filename, $this->get_quality() ) ) ) {
+                return new WP_Error( 'image_save_error', __( 'Image Editor Save Failed' ) );
+            }
+        } elseif ( 'image/webp' == $mime_type ) {
+            if ( ! function_exists( 'imagewebp' ) || ! $this->make_image( $filename, 'imagewebp', array( $image, $filename, $this->get_quality() ) ) ) {
                 return new WP_Error( 'image_save_error', __( 'Image Editor Save Failed' ) );
             }
@@ -503 +517 @@
                 header( 'Content-Type: image/gif' );
                 return imagegif( $this->image );
+            case 'image/webp':
+                if ( function_exists( 'imagewebp' ) ) {
+                    header( 'Content-Type: image/webp' );
+                    return imagewebp( $this->image, null, $this->get_quality() );
+                }
+                // Fall back to the default if webp isn't supported.
             default:
                 header( 'Content-Type: image/jpeg' );