BUGFIX: Respect aspect ratio

sitegeist · Sep 6, 2023 · 41f3808 · 41f3808
1 parent ac6f90a
commit 41f3808
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/Classes/Domain/AbstractScalableImageSource.php b/Classes/Domain/AbstractScalableImageSource.php
@@ -44,7 +44,11 @@ public function withWidth(int $targetWidth = null, bool $preserveAspect = false)
         $newSource = clone $this;
         $newSource->targetWidth = $targetWidth;
         if ($preserveAspect === true) {
-            $aspect = ($this->targetWidth ?: $this->baseWidth) / ($this->targetHeight ?: $this->baseHeight);
+            if ($this->targetWidth && $this->targetHeight) {
+                $aspect = $this->targetWidth / $this->targetHeight;
+            } else {
+                $aspect = $this->baseWidth / $this->baseHeight;
+            }
             $newSource->targetHeight = (int) round($targetWidth / $aspect);
         }
 
@@ -62,7 +66,11 @@ public function withHeight(int $targetHeight = null, bool $preserveAspect = fals
         $newSource = clone $this;
         $newSource->targetHeight = $targetHeight;
         if ($preserveAspect === true) {
-            $aspect = ($this->targetWidth ?: $this->baseWidth) / ($this->targetHeight ?: $this->baseHeight);
+            if ($this->targetWidth && $this->targetHeight) {
+                $aspect = $this->targetWidth / $this->targetHeight;
+            } else {
+                $aspect = $this->baseWidth / $this->baseHeight;
+            }
             $newSource->targetWidth = (int) round($targetHeight * $aspect);
         }