From b2070a85c63fe1eb61d54ccc0043025c5ca4da6c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20Wolda=C5=84ski?= <t.woldanski@macopedia.com>
Date: Tue, 25 Jun 2024 16:04:21 +0200
Subject: [PATCH] [BUGFIX] Restore options to scale/crop images

---
 Classes/Utility/File/ProcessingConfiguration.php | 8 ++++----
 Classes/Utility/FileUtility.php                  | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Classes/Utility/File/ProcessingConfiguration.php b/Classes/Utility/File/ProcessingConfiguration.php
index 4d30d5b7..1102b167 100644
--- a/Classes/Utility/File/ProcessingConfiguration.php
+++ b/Classes/Utility/File/ProcessingConfiguration.php
@@ -24,8 +24,8 @@ class ProcessingConfiguration
     public static function fromOptions(array $options): static
     {
         return new static(
-            (int)($options['width'] ?? 0),
-            (int)($options['height'] ?? 0),
+            (string)($options['width'] ?? ''),
+            (string)($options['height'] ?? ''),
             (int)($options['minWidth'] ?? 0),
             (int)($options['minHeight'] ?? 0),
             (int)($options['maxWidth'] ?? 0),
@@ -52,8 +52,8 @@ public static function fromOptions(array $options): static
     }
 
     private function __construct(
-        public readonly int $width = 0,
-        public readonly int $height = 0,
+        public readonly string $width = '',
+        public readonly string $height = '',
         public readonly int $minWidth = 0,
         public readonly int $minHeight = 0,
         public readonly int $maxWidth = 0,
diff --git a/Classes/Utility/FileUtility.php b/Classes/Utility/FileUtility.php
index c4c4b8a9..58868350 100644
--- a/Classes/Utility/FileUtility.php
+++ b/Classes/Utility/FileUtility.php
@@ -347,8 +347,8 @@ private function processAutogenerate(FileInterface $originalReference, FileInter
     {
         $originalWidth = $originalReference->getProperty('width');
         $originalHeight = $originalReference->getProperty('height');
-        $targetWidth = $processingConfiguration->width > 0 ? $processingConfiguration->width : $fileReference->getProperty('width');
-        $targetHeight = $processingConfiguration->height > 0 ? $processingConfiguration->height : $fileReference->getProperty('height');
+        $targetWidth = (int)($processingConfiguration->width !== '' ? $processingConfiguration->width : $fileReference->getProperty('width'));
+        $targetHeight = (int)($processingConfiguration->height !== '' ? $processingConfiguration->height : $fileReference->getProperty('height'));
 
         if ($targetWidth || $targetHeight) {
             foreach ($processingConfiguration->autogenerate as $autogenerateKey => $conf) {