feat: Respect exif tag for orientation

baupen · Nov 13, 2024 · 3f17b4e · 3f17b4e
1 parent f9cd80c
commit 3f17b4e
Show file tree

Hide file tree

Showing 4 changed files with 94 additions and 46 deletions.
diff --git a/composer.json b/composer.json
@@ -6,6 +6,7 @@
   "require": {
     "php": ">=8.2",
     "ext-ctype": "*",
+    "ext-exif": "*",
     "ext-gd": "*",
     "ext-iconv": "*",
     "ext-json": "*",
@@ -18,6 +19,7 @@
     "doctrine/orm": "^2.7",
     "nelmio/cors-bundle": "^2.1",
     "phpdocumentor/reflection-docblock": "^5.2",
+    "phpstan/phpdoc-parser": "^1",
     "symfony/asset": "^6",
     "symfony/console": "^6",
     "symfony/dotenv": "^6",

diff --git a/composer.lock b/composer.lock
diff --git a/src/Helper/ImageHelper.php b/src/Helper/ImageHelper.php
@@ -25,6 +25,16 @@ public static function fitInBoundingBox(string $imgPath, mixed $boxWidth, mixed
         $imageWidth = $imageSizes[0];
         $imageHeight = $imageSizes[1];
 
+        return self::fitInBoundingBoxRaw($imageWidth, $imageHeight, $boxWidth, $boxHeight, $expand);
+    }
+
+    /**
+     * gives back the width and height to be used.
+     *
+     * @return int[]
+     */
+    public static function fitInBoundingBoxRaw(int $imageWidth, int $imageHeight, mixed $boxWidth, mixed $boxHeight, bool $expand = true): array
+    {
         // get ratios
         $widthRatio = (float) $boxWidth / $imageWidth;
         $heightRatio = (float) $boxHeight / $imageHeight;

diff --git a/src/Service/Image/GdService.php b/src/Service/Image/GdService.php
@@ -104,9 +104,30 @@ public function drawCrosshair(float $positionX, float $positionY, string $color,
         }
     }
 
+    private function getQuarterRotation(string $sourcePath): int
+    {
+        if (function_exists('exif_read_data')) {
+            $exif = exif_read_data($sourcePath);
+            if (!empty($exif['Orientation'])) {
+                return match ($exif['Orientation']) {
+                    3 => 2,
+                    6 => 3,
+                    8 => 1,
+                };
+            }
+        }
+
+        return 0;
+    }
+
     public function resizeImage(string $sourcePath, string $targetPath, int $maxWidth, int $maxHeight): bool
     {
-        list($width, $height) = ImageHelper::fitInBoundingBox($sourcePath, $maxWidth, $maxHeight, false);
+        $rotation = $this->getQuarterRotation($sourcePath);
+        $imageSizes = getimagesize($sourcePath);
+        $imageWidth = $imageSizes[$rotation % 2];
+        $imageHeight = $imageSizes[($rotation + 1) % 2];
+
+        list($width, $height) = ImageHelper::fitInBoundingBoxRaw($imageWidth, $imageHeight, $maxWidth, $maxHeight, false);
         $ending = strtolower(pathinfo($sourcePath, PATHINFO_EXTENSION));
 
         // resize & save
@@ -121,6 +142,10 @@ public function resizeImage(string $sourcePath, string $targetPath, int $maxWidt
                 return false;
             }
 
+            if ($rotation > 0) {
+                $originalImage = imagerotate($originalImage, $rotation * 90, 0);
+            }
+
             imagecopyresampled($newImage, $originalImage, 0, 0, 0, 0, $width, $height, imagesx($originalImage), imagesy($originalImage));
             imagejpeg($newImage, $targetPath, 80);
         } elseif ('png' === $ending) {
@@ -129,6 +154,10 @@ public function resizeImage(string $sourcePath, string $targetPath, int $maxWidt
                 return false;
             }
 
+            if ($rotation > 0) {
+                $originalImage = imagerotate($originalImage, $rotation * 90, 0);
+            }
+
             imagecopyresampled($newImage, $originalImage, 0, 0, 0, 0, $width, $height, imagesx($originalImage), imagesy($originalImage));
             imagepng($newImage, $targetPath, 8);
         } elseif ('gif' === $ending) {
@@ -137,6 +166,10 @@ public function resizeImage(string $sourcePath, string $targetPath, int $maxWidt
                 return false;
             }
 
+            if ($rotation > 0) {
+                $originalImage = imagerotate($originalImage, $rotation * 90, 0);
+            }
+
             imagecopyresampled($newImage, $originalImage, 0, 0, 0, 0, $width, $height, imagesx($originalImage), imagesy($originalImage));
             imagegif($newImage, $targetPath);
         } else {