XWIKI-22411: Image inserted with height or width parameter isn't displayed in...

XWIKI-22411: Image inserted with height or width parameter isn't displayed in the orientation provided by EXIF data

* Use Thumbnailator to read the image which correctly interprets the
  EXIF data.
* Add a test with a test image.

(cherry picked from commit 5f134afb)

xwiki-platform-core/xwiki-platform-image/xwiki-platform-image-processing/xwiki-platform-image-processing-api/src/main/java/com/xpn/xwiki/internal/plugin/image/ThumbnailatorImageProcessor.java

@@ -23,6 +23,7 @@
 import java.awt.image.BufferedImage;
 import java.awt.image.RenderedImage;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.Iterator;
 
@@ -34,6 +35,7 @@
 import org.xwiki.component.annotation.Component;
 
 import net.coobird.thumbnailator.Thumbnails;
+import net.coobird.thumbnailator.resizers.Resizers;
 
 /**
  * Image processor implementation based on the Thumbnailator library.
@@ -47,6 +49,21 @@
 @Named("thumbnailator")
 public class ThumbnailatorImageProcessor extends DefaultImageProcessor
 {
+    @Override
+    public Image readImage(InputStream inputStream) throws IOException
+    {
+        try {
+            // Use Thumbnailator to read the image to correctly interpret the orientation that is set in Exif metadata.
+            return Thumbnails.of(inputStream)
+                .scale(1)
+                // Ensure that nothing is actually resized and there is thus no quality loss.
+                .resizer(Resizers.NULL)
+                .asBufferedImage();
+        } catch (Exception e) {
+            return super.readImage(inputStream);
+        }
+    }
+
     @Override
     public void writeImage(RenderedImage image, String mimeType, float quality, OutputStream out) throws IOException
     {

xwiki-platform-core/xwiki-platform-image/xwiki-platform-image-processing/xwiki-platform-image-processing-api/src/test/java/com/xpn/xwiki/internal/plugin/image/ThumbnailatorImageProcessorTest.java

@@ -24,6 +24,8 @@
 import java.awt.Image;
 import java.awt.image.BufferedImage;
 import java.awt.image.RenderedImage;
+import java.io.IOException;
+import java.io.InputStream;
 
 import org.junit.jupiter.api.Test;
 import org.xwiki.test.junit5.mockito.ComponentTest;
@@ -42,6 +44,19 @@ class ThumbnailatorImageProcessorTest
     @InjectMockComponents
     private ThumbnailatorImageProcessor imageProcessor;
 
+    @Test
+    void readImage() throws IOException
+    {
+        // Example image from https://github.com/recurser/exif-orientation-examples,
+        // Copyright (c) 2010 Dave Perrett, http://recursive-design.com/, licensed under the MIT license.
+        // Original photo by John Salvino https://unsplash.com/photos/1PPpwrTNkJI
+        try (InputStream imageInput = getClass().getResourceAsStream("/Portrait_5.jpg")) {
+            Image image = this.imageProcessor.readImage(imageInput);
+            assertEquals(1200, image.getWidth(null));
+            assertEquals(1800, image.getHeight(null));
+        }
+    }
+
     @Test
     void changeAspectRatio()
     {