X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FObject%2FImage.php;h=5e915d84f5f47ca9154c2cb6b7a3f45aa7e11f71;hb=b9bb525fe91c176ada2323c2d628291a27594d59;hp=7069f7a47f561aacf53e399ea2ebe829b6ff47c9;hpb=8b3a9fc58a969a3d9202f6858d5228f3a28be1ef;p=friendica.git

diff --git a/src/Object/Image.php b/src/Object/Image.php
index 7069f7a47f..5e915d84f5 100644
--- a/src/Object/Image.php
+++ b/src/Object/Image.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2022, the Friendica project
+ * @copyright Copyright (C) 2010-2023, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -196,7 +196,7 @@ class Image
 	public function isValid(): bool
 	{
 		if ($this->isImagick()) {
-			return ($this->image !== false);
+			return !empty($this->image);
 		}
 		return $this->valid;
 	}
@@ -285,49 +285,13 @@ class Image
 		$width = $this->getWidth();
 		$height = $this->getHeight();
 
-		if ((! $width)|| (! $height)) {
-			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;
-			}
+		$scale = Images::getScalingDimensions($width, $height, $max);
+		if ($scale) {
+			return $this->scale($scale['width'], $scale['height']);
 		} 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 false;
 		}
 
-		return $this->scale($dest_width, $dest_height);
 	}
 
 	/**
@@ -414,13 +378,13 @@ class Image
 			$orientation = $this->image->getImageOrientation();
 			switch ($orientation) {
 				case Imagick::ORIENTATION_BOTTOMRIGHT:
-					$this->image->rotateimage("#000", 180);
+					$this->rotate(180);
 					break;
 				case Imagick::ORIENTATION_RIGHTTOP:
-					$this->image->rotateimage("#000", 90);
+					$this->rotate(-90);
 					break;
 				case Imagick::ORIENTATION_LEFTBOTTOM:
-					$this->image->rotateimage("#000", -90);
+					$this->rotate(90);
 					break;
 			}
 
@@ -636,7 +600,7 @@ class Image
 			do {
 				$this->image->cropImage($w, $h, $x, $y);
 				/*
-				 * We need to remove the canva,
+				 * We need to remove the canvas,
 				 * or the image is not resized to the crop:
 				 * http://php.net/manual/en/imagick.cropimage.php#97232
 				 */
@@ -734,15 +698,19 @@ class Image
 			return '';
 		}
 
-		$width = $image->getWidth();
+		$width  = $image->getWidth();
 		$height = $image->getHeight();
 
 		if (max($width, $height) > 90) {
 			$image->scaleDown(90);
-			$width = $image->getWidth();
+			$width  = $image->getWidth();
 			$height = $image->getHeight();
 		}
 
+		if (empty($width) || empty($height)) {
+			return '';
+		}
+
 		$pixels = [];
 		for ($y = 0; $y < $height; ++$y) {
 			$row = [];
@@ -750,7 +718,7 @@ class Image
 				if ($image->isImagick()) {
 					try {
 						$colors = $image->image->getImagePixelColor($x, $y)->getColor();
-					} catch (\Throwable $th) {
+					} catch (\Exception $exception) {
 						return '';
 					}
 					$row[] = [$colors['r'], $colors['g'], $colors['b']];