Changeset 55278

Timestamp:

02/07/2023 05:22:41 PM (2 years ago)

Author:

danielbachhuber

Message:

Media: Bail early if image is already the requested size.

In WP_Image_Editor_Imagick, bail early in make_subsize() if the image is already the requested size. Previously, make_subsize() would create another copy of the file. WP_Image_Editor_GD doesn't have the same problem.

Props wojtekn, danielbachhuber.
Fixes #57370.

Location:

trunk

Files:

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

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

@@ -504 +504 @@
         }
 
+        if ( ( $this->size['width'] == $size_data['width'] ) && ( $this->size['height'] == $size_data['height'] ) ) {
+            return new WP_Error( 'image_subsize_create_error', __( 'The image already has the requested size.' ) );
+        }
+
         $resized = $this->resize( $size_data['width'], $size_data['height'], $size_data['crop'] );
 

trunk/tests/phpunit/tests/media.php

@@ -3772 +3772 @@
 
     /**
+     * Test that an image size isn't generated if it matches the original image size.
+     */
+    public function test_wp_generate_attachment_metadata_doesnt_generate_sizes_for_150_square_image() {
+        $temp_dir = get_temp_dir();
+        $file     = $temp_dir . '/test-square-150.jpg';
+        copy( DIR_TESTDATA . '/images/test-square-150.jpg', $file );
+
+        $attachment_id = self::factory()->attachment->create_object(
+            array(
+                'post_mime_type' => 'image/jpeg',
+                'file'           => $file,
+            )
+        );
+
+        $metadata = wp_generate_attachment_metadata( $attachment_id, $file );
+        $this->assertEquals(
+            array(),
+            $metadata['sizes']
+        );
+        $this->assertEquals(
+            'test-square-150.jpg',
+            basename( $metadata['file'] )
+        );
+        $this->assertEquals(
+            '150',
+            $metadata['width']
+        );
+        $this->assertEquals(
+            '150',
+            $metadata['height']
+        );
+    }
+
+    /**
      * Add threshold to create a `-scaled` output image for testing.
      */