Changeset 59360 for branches/6.7

Timestamp:

11/06/2024 12:45:48 AM (7 weeks ago)

Author:

peterwilsoncc

Message:

Media: Fix uploading of .heic images.

• Adds support for all HEIC/HEIF mime types: image/heic, image/heif, image/heic-sequence, and image/heif-sequence.
• Introduces wp_is_heic_image_mime_type().

This backport includes a subsequent fix of a typo.

Reviewed by peterwilsoncc.
Merges [59315,59358] to the 6.7 branch.

Props swissspidy, adamsilverstein, debarghyabanerjee, ironprogrammer, peterwilsoncc, apermo, azaozz, mosne.
Fixes #62272.

Location:

branches/6.7

Files:

• . (modified) (1 prop)
• src/js/media/controllers/library.js (modified) (1 diff)
• src/wp-includes/class-wp-image-editor-imagick.php (modified) (1 diff)
• src/wp-includes/functions.php (modified) (8 diffs)
• src/wp-includes/media.php (modified) (4 diffs)

branches/6.7/src/js/media/controllers/library.js

@@ -197 +197 @@
         // If uploading, we know the filename but not the mime type.
         if ( attachment.get('uploading') ) {
-            return /\.(jpe?g|png|gif|webp|avif|heic)$/i.test( attachment.get('filename') );
+            return /\.(jpe?g|png|gif|webp|avif|heic|heif)$/i.test( attachment.get('filename') );
         }
 

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

@@ -272 +272 @@
          * are properly sized without affecting previous `getImageGeometry` behavior.
          */
-        if ( ( ! $width || ! $height ) && ( 'image/avif' === $this->mime_type || 'image/heic' === $this->mime_type ) ) {
+        if ( ( ! $width || ! $height ) && ( 'image/avif' === $this->mime_type || wp_is_heic_image_mime_type( $this->mime_type ) ) ) {
             $size   = wp_getimagesize( $this->file );
             $width  = $size[0];

branches/6.7/src/wp-includes/functions.php

@@ -3102 +3102 @@
         $real_mime = wp_get_image_mime( $file );
 
-        if ( $real_mime && $real_mime !== $type ) {
+        $heic_images_extensions = array(
+            'heif',
+            'heics',
+            'heifs',
+        );
+
+        if ( $real_mime && ( $real_mime !== $type || in_array( $ext, $heic_images_extensions, true ) ) ) {
             /**
              * Filters the list mapping image mime types to their respective extensions.
@@ -3120 +3126 @@
                     'image/webp' => 'webp',
                     'image/avif' => 'avif',
+
+                    /*
+                     * In theory there are/should be file extensions that correspond to the
+                     * mime types: .heif, .heics and .heifs. However it seems that HEIC images
+                     * with any of the mime types commonly have a .heic file extension.
+                     * Seems keeping the status quo here is best for compatibility.
+                     */
                     'image/heic' => 'heic',
+                    'image/heif' => 'heic',
+                    'image/heic-sequence' => 'heic',
+                    'image/heif-sequence' => 'heic',
                 )
             );
@@ -3127 +3143 @@
             if ( ! empty( $mime_to_ext[ $real_mime ] ) ) {
                 $filename_parts = explode( '.', $filename );
+
                 array_pop( $filename_parts );
                 $filename_parts[] = $mime_to_ext[ $real_mime ];
@@ -3317 +3334 @@
         } elseif ( function_exists( 'getimagesize' ) ) {
             // Don't silence errors when in debug mode, unless running unit tests.
-            if ( defined( 'WP_DEBUG' ) && WP_DEBUG
-                && ! defined( 'WP_RUN_CORE_TESTS' )
-            ) {
+            if ( defined( 'WP_DEBUG' ) && WP_DEBUG && ! defined( 'WP_RUN_CORE_TESTS' ) ) {
                 // Not using wp_getimagesize() here to avoid an infinite loop.
                 $imagesize = getimagesize( $file );
@@ -3366 +3381 @@
         $magic = str_split( $magic, 8 );
 
-        if (
-            isset( $magic[1] ) &&
-            isset( $magic[2] ) &&
-            'ftyp' === hex2bin( $magic[1] ) &&
-            ( 'avif' === hex2bin( $magic[2] ) || 'avis' === hex2bin( $magic[2] ) )
-        ) {
-            $mime = 'image/avif';
-        }
-
-        if (
-            isset( $magic[1] ) &&
-            isset( $magic[2] ) &&
-            'ftyp' === hex2bin( $magic[1] ) &&
-            ( 'heic' === hex2bin( $magic[2] ) || 'heif' === hex2bin( $magic[2] ) )
-        ) {
-            $mime = 'image/heic';
+        if ( isset( $magic[1] ) && isset( $magic[2] ) && 'ftyp' === hex2bin( $magic[1] ) ) {
+            if ( 'avif' === hex2bin( $magic[2] ) || 'avis' === hex2bin( $magic[2] ) ) {
+                $mime = 'image/avif';
+            } elseif ( 'heic' === hex2bin( $magic[2] ) ) {
+                $mime = 'image/heic';
+            } elseif ( 'heif' === hex2bin( $magic[2] ) ) {
+                $mime = 'image/heif';
+            } else {
+                /*
+                 * HEIC/HEIF images and image sequences/animations may have other strings here
+                 * like mif1, msf1, etc. For now fall back to using finfo_file() to detect these.
+                 */
+                if ( extension_loaded( 'fileinfo' ) ) {
+                    $fileinfo  = finfo_open( FILEINFO_MIME_TYPE );
+                    $mime_type = finfo_file( $fileinfo, $file );
+                    finfo_close( $fileinfo );
+
+                    if ( wp_is_heic_image_mime_type( $mime_type ) ) {
+                        $mime = $mime_type;
+                    }
+                }
+            }
         }
     } catch ( Exception $e ) {
@@ -3424 +3445 @@
             'avif'                         => 'image/avif',
             'ico'                          => 'image/x-icon',
+
+            // TODO: Needs improvement. All images with the following mime types seem to have .heic file extension.
             'heic'                         => 'image/heic',
+            'heif'                         => 'image/heif',
+            'heics'                        => 'image/heic-sequence',
+            'heifs'                        => 'image/heif-sequence',
+
             // Video formats.
             'asf|asx'                      => 'video/x-ms-asf',
@@ -3544 +3571 @@
         'ext2type',
         array(
-            'image'       => array( 'jpg', 'jpeg', 'jpe', 'gif', 'png', 'bmp', 'tif', 'tiff', 'ico', 'heic', 'webp', 'avif' ),
+            'image'       => array( 'jpg', 'jpeg', 'jpe', 'gif', 'png', 'bmp', 'tif', 'tiff', 'ico', 'heic', 'heif', 'webp', 'avif' ),
             'audio'       => array( 'aac', 'ac3', 'aif', 'aiff', 'flac', 'm3a', 'm4a', 'm4b', 'mka', 'mp1', 'mp2', 'mp3', 'ogg', 'oga', 'ram', 'wav', 'wma' ),
             'video'       => array( '3g2', '3gp', '3gpp', 'asf', 'avi', 'divx', 'dv', 'flv', 'm4v', 'mkv', 'mov', 'mp4', 'mpeg', 'mpg', 'mpv', 'ogm', 'ogv', 'qt', 'rm', 'vob', 'wmv' ),
@@ -9038 +9065 @@
     echo wp_kses_post( wp_get_admin_notice( $message, $args ) );
 }
+
+/**
+ * Checks if a mime type is for a HEIC/HEIF image.
+ *
+ * @since 6.7.0
+ *
+ * @param string $mime_type The mime type to check.
+ * @return bool Whether the mime type is for a HEIC/HEIF image.
+ */
+function wp_is_heic_image_mime_type( $mime_type ) {
+    $heic_mime_types = array(
+        'image/heic',
+        'image/heif',
+        'image/heic-sequence',
+        'image/heif-sequence',
+    );
+
+    return in_array( $mime_type, $heic_mime_types, true );
+}

branches/6.7/src/wp-includes/media.php

@@ -5628 +5628 @@
 function wp_getimagesize( $filename, ?array &$image_info = null ) {
     // Don't silence errors when in debug mode, unless running unit tests.
-    if ( defined( 'WP_DEBUG' ) && WP_DEBUG
-        && ! defined( 'WP_RUN_CORE_TESTS' )
-    ) {
+    if ( defined( 'WP_DEBUG' ) && WP_DEBUG && ! defined( 'WP_RUN_CORE_TESTS' ) ) {
         if ( 2 === func_num_args() ) {
             $info = getimagesize( $filename, $image_info );
@@ -5661 +5659 @@
     }
 
+    $image_mime_type = wp_get_image_mime( $filename );
+
+    // Not an image?
+    if ( false === $image_mime_type ) {
+        return false;
+    }
+
     /*
      * For PHP versions that don't support WebP images,
      * extract the image size info from the file headers.
      */
-    if ( 'image/webp' === wp_get_image_mime( $filename ) ) {
+    if ( 'image/webp' === $image_mime_type ) {
         $webp_info = wp_get_webp_info( $filename );
         $width     = $webp_info['width'];
@@ -5687 +5692 @@
 
     // For PHP versions that don't support AVIF images, extract the image size info from the file headers.
-    if ( 'image/avif' === wp_get_image_mime( $filename ) ) {
+    if ( 'image/avif' === $image_mime_type ) {
         $avif_info = wp_get_avif_info( $filename );
 
@@ -5710 +5715 @@
 
     // For PHP versions that don't support HEIC images, extract the size info using Imagick when available.
-    if ( 'image/heic' === wp_get_image_mime( $filename ) ) {
+    if ( wp_is_heic_image_mime_type( $image_mime_type ) ) {
         $editor = wp_get_image_editor( $filename );
+
         if ( is_wp_error( $editor ) ) {
             return false;
         }
+
         // If the editor for HEICs is Imagick, use it to get the image size.
         if ( $editor instanceof WP_Image_Editor_Imagick ) {