Nemcio/Grav
1
0
Fork 0
mirror of https://github.com/getgrav/grav.git synced 2026-09-02 03:47:32 +02:00
Code Issues Packages Projects Releases Activity

Improve ImageOperationsTrait & co

Browse Source
This commit is contained in:
Matias Griese
2022-02-18 19:46:09 +02:00
parent 1ffe2e13bf
commit 093f16f350
2 changed files with 26 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
system/src/Grav/Framework/Image/Image.php
View File

@@ -15,10 +15,16 @@ class Image implements ImageOperationsInterface
use ImageOperationsTrait;
use Serializable;
/** @var int */
protected $origWidth;
/** @var int */
protected $origHeight;
/** @var string */
protected $filepath;
/** @var array */
protected $info;
/** @var int */
protected $modified;
/** @var int */
protected $size;
/**
* @param string $filepath
@@ -27,8 +33,8 @@ class Image implements ImageOperationsInterface
public function __construct(string $filepath, array $info)
{
$this->filepath = $filepath;
$this->width = $info['width'] ?? 0;
$this->height = $info['height'] ?? 0;
$this->origWidth = $this->width = $info['width'] ?? 0;
$this->origHeight = $this->height = $info['height'] ?? 0;
$this->orientation = isset($info['exif']['Orientation']) ? (int)$info['exif']['Orientation'] : null;
}
@@ -40,10 +46,11 @@ class Image implements ImageOperationsInterface
return [
'image' => 1,
'filepath' => $this->filepath,
'info' => $this->info,
'orientation' => $this->orientation,
'orig_width' => $this->origWidth,
'orig_height' => $this->origHeight,
'width' => $this->width,
'height' => $this->height,
'orientation' => $this->orientation,
'operations' => $this->operations,
];
}
@@ -60,10 +67,11 @@ class Image implements ImageOperationsInterface
}
$this->filepath = $data['filepath'];
$this->info = $data['info'];
$this->origWidth = $data['orig_width'];
$this->origHeight = $data['orig_height'];
$this->orientation = $data['orientation'];
$this->width = $data['width'];
$this->height = $data['height'];
$this->orientation = $data['orientation'];
$this->operations = $data['operations'];
}

10
system/src/Grav/Framework/Image/Traits/ImageOperationsTrait.php
View File

@@ -145,6 +145,11 @@ trait ImageOperationsTrait
$height = $new_height;
}
if ($width === $new_width && $height === $new_height) {
// Nothing to resize.
return $this;
}
$this->operations[] = ['resize', [$bg, $width, $height, $new_width, $new_height]];
// Update image size.
@@ -261,6 +266,11 @@ trait ImageOperationsTrait
*/
public function crop(int $x, int $y, int $width, int $height)
{
if ($x === 0 && $y === 0 && $width === $this->width && $height === $this->height) {
// Nothing to crop.
return $this;
}
$this->operations[] = ['crop', [$x, $y, $width, $height]];
// Update image size.