New parameter to create a share block for display reasons

[friendica.git] / src / Object / Image.php

diff --git a/src/Object/Image.php b/src/Object/Image.php
index 67a1af3d1ec47b374f7c9fa49f1301468bcae380..5e915d84f5f47ca9154c2cb6b7a3f45aa7e11f71 100644 (file)
--- 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,7 +285,7 @@ class Image
                $width = $this->getWidth();
                $height = $this->getHeight();
 
-               $scale = Images::getScalingDimensions($width, $height,$max);
+               $scale = Images::getScalingDimensions($width, $height, $max);
                if ($scale) {
                        return $this->scale($scale['width'], $scale['height']);
                } else {
@@ -378,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;
                        }
 
@@ -600,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
                                 */
@@ -718,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']];