Change Mastodon API documentation URL for V1 Instance type

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

diff --git a/src/Object/Image.php b/src/Object/Image.php
index 430ad6f139155b56e68ae8e523ab9bdf99a9bfd7..d6c897e88dcf392dd80a85ecaea9a383852084ab 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,12 +285,13 @@ class Image
                $width = $this->getWidth();
                $height = $this->getHeight();
 
-               if ((! $width)|| (! $height)) {
+               $scale = Images::getScalingDimensions($width, $height, $max);
+               if ($scale) {
+                       return $this->scale($scale['width'], $scale['height']);
+               } else {
                        return false;
                }
 
-               $scale = Images::getScalingDimensions($width, $height,$max);
-               return $this->scale($scale['width'], $scale['height']);
        }
 
        /**
@@ -377,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;
                        }