<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[59317] trunk/src: Media: Fix converting of all HEIC/HEIF images to JPEGs after uploading regardless of dimensions.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/59317">59317</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/59317","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>azaozz</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2024-10-29 05:59:10 +0000 (Tue, 29 Oct 2024)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Media: Fix converting of all HEIC/HEIF images to JPEGs after uploading regardless of dimensions.
Props ironprogrammer, adamsilverstein, azaozz.
Fixes <a href="https://core.trac.wordpress.org/ticket/62305">#62305</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesimagephp">trunk/src/wp-admin/includes/image.php</a></li>
<li><a href="#trunksrcwpincludesmediaphp">trunk/src/wp-includes/media.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesimagephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/image.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/image.php 2024-10-29 03:11:35 UTC (rev 59316)
+++ trunk/src/wp-admin/includes/image.php 2024-10-29 05:59:10 UTC (rev 59317)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -291,7 +291,22 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * If the original image's dimensions are over the threshold,
</span><span class="cx" style="display: block; padding: 0 10px"> * scale the image and use it as the "full" size.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $scale_down = false;
+ $convert = false;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $threshold && ( $image_meta['width'] > $threshold || $image_meta['height'] > $threshold ) ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // The image will be converted if needed on saving.
+ $scale_down = true;
+ } else {
+ // The image may need to be converted regardless of its dimensions.
+ $output_format = wp_get_image_editor_output_format( $file, $imagesize['mime'] );
+
+ if ( is_array( $output_format ) && array_key_exists( $imagesize['mime'], $output_format ) ) {
+ $convert = true;
+ }
+ }
+
+ if ( $scale_down || $convert ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $editor = wp_get_image_editor( $file );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_wp_error( $editor ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -299,14 +314,20 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $image_meta;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Resize the image.
- $resized = $editor->resize( $threshold, $threshold );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $scale_down ) {
+ // Resize the image. This will also convet it if needed.
+ $resized = $editor->resize( $threshold, $threshold );
+ } elseif ( $convert ) {
+ // The image will be converted (if possible) when saved.
+ $resized = true;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $rotated = null;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // If there is EXIF data, rotate according to EXIF Orientation.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_wp_error( $resized ) && is_array( $exif_meta ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $resized = $editor->maybe_exif_rotate();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $rotated = $resized;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $rotated = $resized; // bool true or WP_Error
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_wp_error( $resized ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -314,7 +335,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Append "-scaled" to the image file name. It will look like "my_image-scaled.jpg".
</span><span class="cx" style="display: block; padding: 0 10px"> * This doesn't affect the sub-sizes names as they are generated from the original image (for best quality).
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $saved = $editor->save( $editor->generate_filename( 'scaled' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $scale_down ) {
+ $saved = $editor->save( $editor->generate_filename( 'scaled' ) );
+ } else {
+ $saved = $editor->save();
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_wp_error( $saved ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $image_meta = _wp_image_meta_replace_original( $saved, $file, $image_meta, $attachment_id );
</span></span></pre></div>
<a id="trunksrcwpincludesmediaphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/media.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/media.php 2024-10-29 03:11:35 UTC (rev 59316)
+++ trunk/src/wp-includes/media.php 2024-10-29 05:59:10 UTC (rev 59317)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6233,16 +6233,23 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string[] An array of mime type mappings.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_get_image_editor_output_format( $filename, $mime_type ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $default_output_format = array(
+ 'image/heic' => 'image/jpeg',
+ 'image/heif' => 'image/jpeg',
+ 'image/heic-sequence' => 'image/jpeg',
+ 'image/heif-sequence' => 'image/jpeg',
+ );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filters the image editor output format mapping.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Enables filtering the mime type used to save images. By default,
- * the mapping array is empty, so the mime type matches the source image.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Enables filtering the mime type used to save images. By default HEIC/HEIF images
+ * are converted to JPEGs.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @see WP_Image_Editor::get_output_format()
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 5.8.0
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @since 6.7.0 The default was changed from array() to array( 'image/heic' => 'image/jpeg' ).
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 6.7.0 The default was changed from empty array to array containing the HEIC mime types.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string[] $output_format {
</span><span class="cx" style="display: block; padding: 0 10px"> * An array of mime type mappings. Maps a source mime type to a new
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6253,5 +6260,5 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $filename Path to the image.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $mime_type The source image mime type.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return apply_filters( 'image_editor_output_format', array( 'image/heic' => 'image/jpeg' ), $filename, $mime_type );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return apply_filters( 'image_editor_output_format', $default_output_format, $filename, $mime_type );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>