mirror/intervention_image
1
0
Fork 0
mirror of https://github.com/Intervention/image.git synced 2025-08-13 09:24:05 +02:00
Code Issues Releases Wiki Activity

Resizing

Browse Source
This commit is contained in:
Oliver Vogel
2021-11-11 14:11:01 +00:00
parent 372f84ef4c
commit afa86daac4
5 changed files with 154 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/Drivers/Abstract/AbstractImage.php
View File

@@ -169,21 +169,23 @@ abstract class AbstractImage
->scaleDown($crop);
return $this->modify(
$this->resolveDriverClass('Modifiers\CropResizeModifier', $size)
$this->resolveDriverClass('Modifiers\CropResizeModifier', $crop, $resize)
);
}
public function fit(int $width, int $height, string $position = 'center'): ImageInterface
{
// crop
$crop = Resizer::make()
->toSize($this->getSize())
->contain(new Size($width, $height));
$crop = Resizer::make()
->toSize($crop)
->crop($this->getSize(), $position);
$imagesize = $this->getSize();
$resize = new Size($width, $height);
// crop
$crop = new Size($width, $height);
$crop = $crop->contain($imagesize)->alignPivotTo(
$imagesize->alignPivot($position),
$position
);
// resize
$resize = $crop->scale($width, $height);
return $this->modify(
$this->resolveDriverClass('Modifiers\CropResizeModifier', $crop, $resize, $position)
@@ -192,7 +194,17 @@ abstract class AbstractImage
public function fitDown(int $width, int $height, string $position = 'center'): ImageInterface
{
$size = new Size($width, $height);
$imagesize = $this->getSize();
// crop
$crop = new Size($width, $height);
$crop = $crop->contain($imagesize)->alignPivotTo(
$imagesize->alignPivot($position),
$position
);
// resize
$resize = $crop->scaleDown($width, $height);
return $this->modify(
$this->resolveDriverClass('Modifiers\CropResizeModifier', $crop, $resize, $position)

17
src/Geometry/Resizer.php
View File

@@ -2,6 +2,7 @@
namespace Intervention\Image\Geometry;
use Intervention\Image\Geometry\Size;
use Intervention\Image\Interfaces\SizeInterface;
/*
@@ -120,6 +121,10 @@ class Resizer
return $this;
}
if (isset($arguments[0]) && is_a($arguments[0], Size::class)) {
return $this->toSize($arguments[0]);
}
if (isset($arguments[0]) && is_numeric($arguments[0])) {
$this->width($arguments[0]);
}
@@ -163,7 +168,7 @@ class Resizer
public function resize(SizeInterface $size): SizeInterface
{
$resized = clone $size;
$resized = new Size($size->getWidth(), $size->getHeight());
if ($this->hasTargetWidth()) {
$resized->setWidth($this->target->getWidth());
@@ -178,7 +183,7 @@ class Resizer
public function resizeDown(SizeInterface $size): SizeInterface
{
$resized = clone $size;
$resized = new Size($size->getWidth(), $size->getHeight());
if ($this->hasTargetWidth()) {
$resized->setWidth(
@@ -197,7 +202,7 @@ class Resizer
public function scale(SizeInterface $size): SizeInterface
{
$resized = clone $size;
$resized = new Size($size->getWidth(), $size->getHeight());
if ($this->hasTargetWidth() && $this->hasTargetHeight()) {
$resized->setWidth(min(
@@ -221,7 +226,7 @@ class Resizer
public function scaleDown(SizeInterface $size): SizeInterface
{
$resized = clone $size;
$resized = new Size($size->getWidth(), $size->getHeight());
if ($this->hasTargetWidth() && $this->hasTargetHeight()) {
$resized->setWidth(min(
@@ -265,7 +270,7 @@ class Resizer
*/
public function cover(SizeInterface $size): SizeInterface
{
$resized = clone $size;
$resized = new Size($size->getWidth(), $size->getHeight());
// auto height
$resized->setWidth($this->target->getWidth());
@@ -288,7 +293,7 @@ class Resizer
*/
public function contain(SizeInterface $size): SizeInterface
{
$resized = clone $size;
$resized = new Size($size->getWidth(), $size->getHeight());
// auto height
$resized->setWidth($this->target->getWidth());

39
src/Geometry/Size.php
View File

@@ -2,6 +2,7 @@
namespace Intervention\Image\Geometry;
use Intervention\Image\Geometry\Resizer;
use Intervention\Image\Interfaces\PointInterface;
use Intervention\Image\Interfaces\SizeInterface;
@@ -210,4 +211,42 @@ class Size implements SizeInterface
return new Point($x, $y);
}
protected function getResizer(...$arguments): Resizer
{
$resizer = new Resizer();
$resizer->setTargetSizeByArray($arguments[0]);
return $resizer;
}
public function resize(...$arguments): self
{
return $this->getResizer($arguments)->resize($this);
}
public function resizeDown(...$arguments): self
{
return $this->getResizer($arguments)->resizeDown($this);
}
public function scale(...$arguments): self
{
return $this->getResizer($arguments)->scale($this);
}
public function scaleDown(...$arguments): self
{
return $this->getResizer($arguments)->scaleDown($this);
}
public function cover(...$arguments): self
{
return $this->getResizer($arguments)->cover($this);
}
public function contain(...$arguments): self
{
return $this->getResizer($arguments)->contain($this);
}
}

2
tests/Geometry/ResizerTest.php
View File

@@ -392,6 +392,7 @@ class ResizerTest extends TestCase
[new Size(800, 600), new Size(800, 600), new Size(800, 600)],
[new Size(400, 300), new Size(120, 120), new Size(160, 120)],
[new Size(600, 800), new Size(100, 100), new Size(100, 133)],
[new Size(100, 100), new Size(800, 600), new Size(800, 800)],
];
}
@@ -418,6 +419,7 @@ class ResizerTest extends TestCase
[new Size(800, 600), new Size(800, 600), new Size(800, 600)],
[new Size(400, 300), new Size(120, 120), new Size(120, 90)],
[new Size(600, 800), new Size(100, 100), new Size(75, 100)],
[new Size(100, 100), new Size(800, 600), new Size(600, 600)],
];
}

80
tests/Geometry/SizeTest.php
View File

@@ -236,4 +236,84 @@ class SizeTest extends TestCase
$this->assertEquals(0, $pos->getX());
$this->assertEquals(50, $pos->getY());
}
public function testResize(): void
{
$size = new Size(300, 200);
$result = $size->resize(120, 150);
$this->assertInstanceOf(Size::class, $result);
$size = new Size(300, 200);
$result = $size->resize(function ($resizer) {
$resizer->toWidth(100);
});
$this->assertInstanceOf(Size::class, $result);
}
public function testResizeDown(): void
{
$size = new Size(300, 200);
$result = $size->resizeDown(120, 150);
$this->assertInstanceOf(Size::class, $result);
$size = new Size(300, 200);
$result = $size->resizeDown(function ($resizer) {
$resizer->toWidth(100);
});
$this->assertInstanceOf(Size::class, $result);
}
public function testScale(): void
{
$size = new Size(300, 200);
$result = $size->scale(120, 150);
$this->assertInstanceOf(Size::class, $result);
$size = new Size(300, 200);
$result = $size->scale(function ($resizer) {
$resizer->toWidth(100);
});
$this->assertInstanceOf(Size::class, $result);
}
public function testScaleDown(): void
{
$size = new Size(300, 200);
$result = $size->scaleDown(120, 150);
$this->assertInstanceOf(Size::class, $result);
$size = new Size(300, 200);
$result = $size->scaleDown(function ($resizer) {
$resizer->toWidth(100);
});
$this->assertInstanceOf(Size::class, $result);
}
public function testCover(): void
{
$size = new Size(300, 200);
$result = $size->cover(120, 150);
$this->assertInstanceOf(Size::class, $result);
$size = new Size(300, 200);
$result = $size->cover(function ($resizer) {
$resizer->toWidth(100);
});
$this->assertInstanceOf(Size::class, $result);
}
public function testContain(): void
{
$size = new Size(100, 100);
$result = $size->contain(800, 600);
$this->assertInstanceOf(Size::class, $result);
$this->assertEquals(600, $result->getWidth());
$this->assertEquals(600, $result->getHeight());
$size = new Size(300, 200);
$result = $size->contain(function ($resizer) {
$resizer->toWidth(100);
});
$this->assertInstanceOf(Size::class, $result);
}
}