<?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
*
$this->type = $type;
if ($this->isImagick() && (empty($data) || $this->loadData($data))) {
+ $this->valid = !empty($data);
return;
} else {
// Failed to load with Imagick, fallback
$this->image->setCompressionQuality($quality);
}
- // The 'width' and 'height' properties are only used by non-Imagick routines.
$this->width = $this->image->getImageWidth();
$this->height = $this->image->getImageHeight();
- $this->valid = true;
+ $this->valid = !empty($this->image);
- return true;
+ return $this->valid;
}
$this->valid = false;
public function isValid(): bool
{
if ($this->isImagick()) {
- return ($this->image !== false);
+ return !empty($this->image);
}
return $this->valid;
}
return false;
}
- if ($this->isImagick()) {
- return $this->image->getImageWidth();
- }
return $this->width;
}
return false;
}
- if ($this->isImagick()) {
- return $this->image->getImageHeight();
- }
return $this->height;
}
$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);
}
/**
do {
$this->image->rotateImage(new ImagickPixel(), -$degrees); // ImageMagick rotates in the opposite direction of imagerotate()
} while ($this->image->nextImage());
+
+ $this->width = $this->image->getImageWidth();
+ $this->height = $this->image->getImageHeight();
return;
}
$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;
}
}
} while ($this->image->nextImage());
- // These may not be necessary anymore
$this->width = $this->image->getImageWidth();
$this->height = $this->image->getImageHeight();
} else {
if ($this->image) {
imagedestroy($this->image);
}
- $this->image = $dest;
+ $this->image = $dest;
$this->width = imagesx($this->image);
$this->height = imagesy($this->image);
*/
public function getBlurHash(): string
{
- $width = $this->getWidth();
- $height = $this->getHeight();
+ $image = New Image($this->asString());
+ if (empty($image) || !$this->isValid()) {
+ return '';
+ }
+
+ $width = $image->getWidth();
+ $height = $image->getHeight();
if (max($width, $height) > 90) {
- $this->scaleDown(90);
- $width = $this->getWidth();
- $height = $this->getHeight();
+ $image->scaleDown(90);
+ $width = $image->getWidth();
+ $height = $image->getHeight();
+ }
+
+ if (empty($width) || empty($height)) {
+ return '';
}
$pixels = [];
for ($y = 0; $y < $height; ++$y) {
$row = [];
for ($x = 0; $x < $width; ++$x) {
- if ($this->isImagick()) {
- $colors = $this->image->getImagePixelColor($x, $y)->getColor();
+ if ($image->isImagick()) {
+ try {
+ $colors = $image->image->getImagePixelColor($x, $y)->getColor();
+ } catch (\Throwable $th) {
+ return '';
+ }
$row[] = [$colors['r'], $colors['g'], $colors['b']];
} else {
- $index = imagecolorat($this->image, $x, $y);
- $colors = @imagecolorsforindex($this->image, $index);
+ $index = imagecolorat($image->image, $x, $y);
+ $colors = @imagecolorsforindex($image->image, $index);
$row[] = [$colors['red'], $colors['green'], $colors['blue']];
}
}
if ($this->isImagick()) {
$this->image->drawImage($draw);
+ $this->width = $this->image->getImageWidth();
+ $this->height = $this->image->getImageHeight();
} else {
$this->width = imagesx($this->image);
$this->height = imagesy($this->image);
}
- $this->valid = true;
+ $this->valid = !empty($this->image);
$this->scaleUp(min($width, $height));
}