X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FObject%2FImage.php;h=5e915d84f5f47ca9154c2cb6b7a3f45aa7e11f71;hb=b9bb525fe91c176ada2323c2d628291a27594d59;hp=67a1af3d1ec47b374f7c9fa49f1301468bcae380;hpb=7b34fdc7152c75caa8f09ffc3569c55fc7e05598;p=friendica.git diff --git a/src/Object/Image.php b/src/Object/Image.php index 67a1af3d1e..5e915d84f5 100644 --- a/src/Object/Image.php +++ b/src/Object/Image.php @@ -1,6 +1,6 @@ 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']];