Ticket #37140: 37140-1.patch

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

@@ -538 +538 @@
                 try {
                         $this->image->rotateImage( new ImagickPixel('none'), 360-$angle );
 
+                        /**
+                         * Normalise rotation exif data so it's consistent across devices with
+                         * what the user is seeing on the current device.
+                         */
+                        $this->image->setImageOrientation( Imagick::ORIENTATION_TOPLEFT );
+
                         // Since this changes the dimensions of the image, update the size.
                         $result = $this->update_size();
                         if ( is_wp_error( $result ) )

new file tests/phpunit/tests/image/orientation.php

@@ +1 @@
+<?php
+require_once dirname( __FILE__ ) . '/base.php';
+
+/**
+ * Test the WP_Image_Editor base class
+ *
+ * @group image
+ * @group media
+ */
+class Tests_Image_Editor_Orientation extends WP_Image_UnitTestCase {
+
+        public $editor_engine = 'WP_Image_Editor_Imagick';
+
+        public function setUp() {
+                require_once( ABSPATH . WPINC . '/class-wp-image-editor.php' );
+                require_once( ABSPATH . WPINC . '/class-wp-image-editor-imagick.php' );
+
+                parent::setUp();
+        }
+
+        /**
+         * Test removing orientation exif data on rotate
+         *
+         * @ticket       37140
+         *
+         * @dataProvider get_images
+         */
+        public function test_remove_orientation_data_on_rotate( $file ) {
+
+                preg_match( '/-(\d)\.(?:jpe?g|png|gif)$/', $file, $matches );
+                $orientation_value = intval( $matches[1] );
+
+                $data = wp_read_image_metadata( $file );
+
+                $this->assertEquals( $orientation_value, intval( $data['orientation'] ), 'Orientation value read from does not match image file exif data: ' . $file );
+
+                $temp_file = wp_tempnam( $file, 'image-tests' ) . '.jpg';
+
+                $image = wp_get_image_editor( $file );
+                $image->rotate( 180 );
+                $image->save( $temp_file );
+
+                $data = wp_read_image_metadata( $temp_file );
+
+                $this->assertEquals( 1, intval( $data['orientation'] ), 'Orientation exif data was not updated after rotating image: ' . $file );
+
+                unlink( $temp_file );
+        }
+
+        /**
+         * dataProvider for images
+         */
+        public function get_images() {
+                return array_map( function ( $num ) {
+                        return array( DIR_TESTDATA . "/images/orientation-{$num}.jpg" );
+                }, range( 1, 8 ) );
+        }
+
+}