Merge pull request #13476 from MrPetovan/bug/13467-image-reliable-dimensions

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

diff --git a/src/Object/Image.php b/src/Object/Image.php
index 00f8f3c5bbe89553a3c7932168b9de85fcacd1c2..5e915d84f5f47ca9154c2cb6b7a3f45aa7e11f71 100644 (file)
--- a/src/Object/Image.php
+++ b/src/Object/Image.php
@@ -196,7 +196,7 @@ class Image
        public function isValid(): bool
        {
                if ($this->isImagick()) {
-                       return ($this->image !== false);
+                       return !empty($this->image);
                }
                return $this->valid;
        }
@@ -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']];