Changeset 59317
- Timestamp:
- 10/29/2024 05:59:10 AM (5 weeks ago)
- Location:
- trunk/src
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/wp-admin/includes/image.php
r58849 r59317 292 292 * scale the image and use it as the "full" size. 293 293 */ 294 $scale_down = false; 295 $convert = false; 296 294 297 if ( $threshold && ( $image_meta['width'] > $threshold || $image_meta['height'] > $threshold ) ) { 298 // The image will be converted if needed on saving. 299 $scale_down = true; 300 } else { 301 // The image may need to be converted regardless of its dimensions. 302 $output_format = wp_get_image_editor_output_format( $file, $imagesize['mime'] ); 303 304 if ( is_array( $output_format ) && array_key_exists( $imagesize['mime'], $output_format ) ) { 305 $convert = true; 306 } 307 } 308 309 if ( $scale_down || $convert ) { 295 310 $editor = wp_get_image_editor( $file ); 296 311 … … 300 315 } 301 316 302 // Resize the image. 303 $resized = $editor->resize( $threshold, $threshold ); 317 if ( $scale_down ) { 318 // Resize the image. This will also convet it if needed. 319 $resized = $editor->resize( $threshold, $threshold ); 320 } elseif ( $convert ) { 321 // The image will be converted (if possible) when saved. 322 $resized = true; 323 } 324 304 325 $rotated = null; 305 326 … … 307 328 if ( ! is_wp_error( $resized ) && is_array( $exif_meta ) ) { 308 329 $resized = $editor->maybe_exif_rotate(); 309 $rotated = $resized; 330 $rotated = $resized; // bool true or WP_Error 310 331 } 311 332 … … 315 336 * This doesn't affect the sub-sizes names as they are generated from the original image (for best quality). 316 337 */ 317 $saved = $editor->save( $editor->generate_filename( 'scaled' ) ); 338 if ( $scale_down ) { 339 $saved = $editor->save( $editor->generate_filename( 'scaled' ) ); 340 } else { 341 $saved = $editor->save(); 342 } 318 343 319 344 if ( ! is_wp_error( $saved ) ) { -
trunk/src/wp-includes/media.php
r59315 r59317 6234 6234 */ 6235 6235 function wp_get_image_editor_output_format( $filename, $mime_type ) { 6236 $default_output_format = array( 6237 'image/heic' => 'image/jpeg', 6238 'image/heif' => 'image/jpeg', 6239 'image/heic-sequence' => 'image/jpeg', 6240 'image/heif-sequence' => 'image/jpeg', 6241 ); 6242 6236 6243 /** 6237 6244 * Filters the image editor output format mapping. 6238 6245 * 6239 * Enables filtering the mime type used to save images. By default ,6240 * the mapping array is empty, so the mime type matches the source image.6246 * Enables filtering the mime type used to save images. By default HEIC/HEIF images 6247 * are converted to JPEGs. 6241 6248 * 6242 6249 * @see WP_Image_Editor::get_output_format() 6243 6250 * 6244 6251 * @since 5.8.0 6245 * @since 6.7.0 The default was changed from array() to array( 'image/heic' => 'image/jpeg' ).6252 * @since 6.7.0 The default was changed from empty array to array containing the HEIC mime types. 6246 6253 * 6247 6254 * @param string[] $output_format { … … 6254 6261 * @param string $mime_type The source image mime type. 6255 6262 */ 6256 return apply_filters( 'image_editor_output_format', array( 'image/heic' => 'image/jpeg' ), $filename, $mime_type );6257 } 6263 return apply_filters( 'image_editor_output_format', $default_output_format, $filename, $mime_type ); 6264 }
Note: See TracChangeset
for help on using the changeset viewer.