Skip to content

Fix aspect ratio handling for gravity crops #45

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TorstenDittmann merged 1 commit into from
Jul 13, 2026
Merged

Fix aspect ratio handling for gravity crops #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions src/Image/Image.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,11 +128,12 @@ public function crop(int $width, int $height, string $gravity = Image::GRAVITY_C
$resizeWidth = $this->width;
$resizeHeight = $this->height;
if ($gravity !== Image::GRAVITY_CENTER) {
if ($width > $height) {
$targetAspect = $width / $height;
if ($targetAspect > $originalAspect) {
$resizeWidth = $width;
$resizeHeight = intval($width * $originalAspect);
$resizeHeight = intval(ceil($width / $originalAspect));
} else {
$resizeWidth = intval($height * $originalAspect);
$resizeWidth = intval(ceil($height * $originalAspect));
$resizeHeight = $height;
}
}
Expand Down
80 changes: 80 additions & 0 deletions tests/Image/ImageTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

namespace Appwrite\Tests;

use PHPUnit\Framework\Attributes\DataProvider;
use PHPUnit\Framework\TestCase;
use Utopia\Image\Image;

Expand Down Expand Up @@ -317,6 +318,85 @@ public function test_crop_gravity_e(): void
\unlink($target);
}

public function test_crop_gravity_preserves_aspect_ratio(): void
{
$source = new \Imagick;
$source->newImage(2, 4, 'red', 'png');

$draw = new \ImagickDraw;
$draw->setFillColor('blue');
$draw->rectangle(0, 2, 1, 3);
$source->drawImage($draw);

$image = new Image($source->getImageBlob());
$image->crop(4, 2, Image::GRAVITY_TOP);

$result = new \Imagick;
$result->readImageBlob($image->output('png', 100) ?: '');
$color = $result->getImagePixelColor(2, 1)->getColor();

$this->assertGreaterThan($color['b'], $color['r']);
}

/**
* @return array<string, array{string, bool, string}>
*/
public static function gravityProvider(): array
{
return [
'horizontal top-left' => [Image::GRAVITY_TOP_LEFT, true, 'r'],
'horizontal top' => [Image::GRAVITY_TOP, true, 'g'],
'horizontal top-right' => [Image::GRAVITY_TOP_RIGHT, true, 'b'],
'horizontal left' => [Image::GRAVITY_LEFT, true, 'r'],
'horizontal center' => [Image::GRAVITY_CENTER, true, 'g'],
'horizontal right' => [Image::GRAVITY_RIGHT, true, 'b'],
'horizontal bottom-left' => [Image::GRAVITY_BOTTOM_LEFT, true, 'r'],
'horizontal bottom' => [Image::GRAVITY_BOTTOM, true, 'g'],
'horizontal bottom-right' => [Image::GRAVITY_BOTTOM_RIGHT, true, 'b'],
'vertical top-left' => [Image::GRAVITY_TOP_LEFT, false, 'r'],
'vertical top' => [Image::GRAVITY_TOP, false, 'r'],
'vertical top-right' => [Image::GRAVITY_TOP_RIGHT, false, 'r'],
'vertical left' => [Image::GRAVITY_LEFT, false, 'g'],
'vertical center' => [Image::GRAVITY_CENTER, false, 'g'],
'vertical right' => [Image::GRAVITY_RIGHT, false, 'g'],
'vertical bottom-left' => [Image::GRAVITY_BOTTOM_LEFT, false, 'b'],
'vertical bottom' => [Image::GRAVITY_BOTTOM, false, 'b'],
'vertical bottom-right' => [Image::GRAVITY_BOTTOM_RIGHT, false, 'b'],
];
}

#[DataProvider('gravityProvider')]
public function test_crop_gravity_positions(string $gravity, bool $horizontal, string $expectedChannel): void
{
$source = new \Imagick;
$source->newImage($horizontal ? 6 : 2, $horizontal ? 2 : 6, 'red', 'png');

$draw = new \ImagickDraw;
$draw->setFillColor('green');
$draw->rectangle($horizontal ? 2 : 0, $horizontal ? 0 : 2, $horizontal ? 3 : 1, $horizontal ? 1 : 3);
$draw->setFillColor('blue');
$draw->rectangle($horizontal ? 4 : 0, $horizontal ? 0 : 4, $horizontal ? 5 : 1, $horizontal ? 1 : 5);
$source->drawImage($draw);

$image = new Image($source->getImageBlob());
$image->crop(2, 2, $gravity);

$result = new \Imagick;
$result->readImageBlob($image->output('png', 100) ?: '');
$color = $result->getImagePixelColor(1, 1)->getColor();

$this->assertSame(2, $result->getImageWidth());
$this->assertSame(2, $result->getImageHeight());
$this->assertGreaterThan($color[match ($expectedChannel) {
'r' => 'g',
default => 'r',
}], $color[$expectedChannel]);
$this->assertGreaterThan($color[match ($expectedChannel) {
'b' => 'g',
default => 'b',
}], $color[$expectedChannel]);
}

public function test_crop100x400(): void
{
$image = new Image(\file_get_contents(__DIR__.'/../resources/disk-a/kitten-1.jpg') ?: '');
Expand Down
Loading