From 88a7dd1afba7ee3f7c415251e74b5fd7ccfb866f Mon Sep 17 00:00:00 2001 From: Marek Bachmann Date: Wed, 28 Dec 2022 03:30:56 +0100 Subject: [PATCH] Replaced the doubled code in for getScalingDimension with Images::getScalingDimensions($width, $height,$max) --- src/Object/Image.php | 41 ++--------------------------------------- 1 file changed, 2 insertions(+), 39 deletions(-) diff --git a/src/Object/Image.php b/src/Object/Image.php index 1d2832f20a..430ad6f139 100644 --- a/src/Object/Image.php +++ b/src/Object/Image.php @@ -289,45 +289,8 @@ class Image return false; } - if ($width > $max && $height > $max) { - // very tall image (greater than 16:9) - // constrain the width - let the height float. - - if ((($height * 9) / 16) > $width) { - $dest_width = $max; - $dest_height = intval(($height * $max) / $width); - } elseif ($width > $height) { - // else constrain both dimensions - $dest_width = $max; - $dest_height = intval(($height * $max) / $width); - } else { - $dest_width = intval(($width * $max) / $height); - $dest_height = $max; - } - } else { - if ($width > $max) { - $dest_width = $max; - $dest_height = intval(($height * $max) / $width); - } else { - if ($height > $max) { - // very tall image (greater than 16:9) - // but width is OK - don't do anything - - if ((($height * 9) / 16) > $width) { - $dest_width = $width; - $dest_height = $height; - } else { - $dest_width = intval(($width * $max) / $height); - $dest_height = $max; - } - } else { - $dest_width = $width; - $dest_height = $height; - } - } - } - - return $this->scale($dest_width, $dest_height); + $scale = Images::getScalingDimensions($width, $height,$max); + return $this->scale($scale['width'], $scale['height']); } /**