mirror/intervention_image
1
0
Fork 0
mirror of https://github.com/Intervention/image.git synced 2025-08-30 17:19:50 +02:00
Code Issues Releases Wiki Activity

Fix bugs

Browse Source
This commit is contained in:
Oliver Vogel
2023-10-22 15:03:58 +02:00
parent 08619025e6
commit 9ba015742d
16 changed files with 112 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Colors/Cmyk/Color.php
View File

@@ -91,7 +91,7 @@ class Color implements ColorInterface
public function toString(): string
{
return sprintf(
'cmyk(%d, %d, %d, %d)',
'cmyk(%d%%, %d%%, %d%%, %d%%)',
$this->cyan()->value(),
$this->magenta()->value(),
$this->yellow()->value(),

5
src/Drivers/Imagick/Font.php
View File

@@ -9,18 +9,19 @@ use Intervention\Image\Drivers\Imagick\Traits\CanHandleColors;
use Intervention\Image\Exceptions\FontException;
use Intervention\Image\Geometry\Polygon;
use Intervention\Image\Geometry\Rectangle;
use Intervention\Image\Interfaces\ColorspaceInterface;
class Font extends AbstractFont
{
use CanHandleColors;
public function toImagickDraw(): ImagickDraw
public function toImagickDraw(ColorspaceInterface $colorspace): ImagickDraw
{
if (!$this->hasFilename()) {
throw new FontException('No font file specified.');
}
$color = $this->colorToPixel($this->getColor());
$color = $this->colorToPixel($this->getColor(), $colorspace);
$draw = new ImagickDraw();
$draw->setStrokeAntialias(true);

11
src/Drivers/Imagick/Image.php
View File

@@ -23,14 +23,7 @@ class Image extends AbstractImage implements ImageInterface, Iterator
public function __construct(protected Imagick $imagick)
{
$this->colorspace = match ($imagick->getImageColorspace()) {
Imagick::COLORSPACE_RGB, Imagick::COLORSPACE_SRGB => new RgbColorspace(),
Imagick::COLORSPACE_CMYK => new CmykColorspace(),
default => function () use ($imagick) {
$imagick->transformImageColorspace(Imagick::COLORSPACE_SRGB);
return new RgbColorspace();
}
};
//
}
public function getImagick(): Imagick
@@ -140,7 +133,7 @@ class Image extends AbstractImage implements ImageInterface, Iterator
if ($frame = $this->getFrame($frame_key)) {
return $this->colorFromPixel(
$frame->getCore()->getImagePixelColor($x, $y),
$this->colorspace
$this->getColorspace()
);
}

5
src/Drivers/Imagick/Modifiers/DrawEllipseModifier.php
View File

@@ -14,8 +14,9 @@ class DrawEllipseModifier extends AbstractDrawModifier implements ModifierInterf
public function apply(ImageInterface $image): ImageInterface
{
$background_color = $this->colorToPixel($this->getBackgroundColor());
$border_color = $this->colorToPixel($this->getBorderColor());
$colorspace = $image->getColorspace();
$background_color = $this->colorToPixel($this->getBackgroundColor(), $colorspace);
$border_color = $this->colorToPixel($this->getBorderColor(), $colorspace);
return $image->eachFrame(function ($frame) use ($background_color, $border_color) {
$drawing = new ImagickDraw();

2
src/Drivers/Imagick/Modifiers/DrawLineModifier.php
View File

@@ -17,7 +17,7 @@ class DrawLineModifier extends AbstractDrawModifier implements ModifierInterface
$drawing = new ImagickDraw();
$drawing->setStrokeWidth($this->line()->getWidth());
$drawing->setStrokeColor(
$this->colorToPixel($this->getBackgroundColor())
$this->colorToPixel($this->getBackgroundColor(), $image->getColorspace())
);
$drawing->line(

2
src/Drivers/Imagick/Modifiers/DrawPixelModifier.php
View File

@@ -30,7 +30,7 @@ class DrawPixelModifier implements ModifierInterface
);
$pixel = new ImagickDraw();
$pixel->setFillColor($this->colorToPixel($color));
$pixel->setFillColor($this->colorToPixel($color, $image->getColorspace()));
$pixel->point($this->position->getX(), $this->position->getY());
return $image->eachFrame(function ($frame) use ($pixel) {

5
src/Drivers/Imagick/Modifiers/DrawPolygonModifier.php
View File

@@ -22,8 +22,9 @@ class DrawPolygonModifier extends AbstractDrawModifier implements ModifierInterf
public function apply(ImageInterface $image): ImageInterface
{
$drawing = new ImagickDraw();
$background_color = $this->colorToPixel($this->getBackgroundColor());
$border_color = $this->colorToPixel($this->getBorderColor());
$colorspace = $image->getColorspace();
$background_color = $this->colorToPixel($this->getBackgroundColor(), $colorspace);
$border_color = $this->colorToPixel($this->getBorderColor(), $colorspace);
if ($this->polygon()->hasBackgroundColor()) {
$drawing->setFillColor($background_color);

5
src/Drivers/Imagick/Modifiers/DrawRectangleModifier.php
View File

@@ -15,8 +15,9 @@ class DrawRectangleModifier extends AbstractDrawModifier implements ModifierInte
public function apply(ImageInterface $image): ImageInterface
{
$drawing = new ImagickDraw();
$background_color = $this->colorToPixel($this->getBackgroundColor());
$border_color = $this->colorToPixel($this->getBorderColor());
$colorspace = $image->getColorspace();
$background_color = $this->colorToPixel($this->getBackgroundColor(), $colorspace);
$border_color = $this->colorToPixel($this->getBorderColor(), $colorspace);
$drawing->setFillColor($background_color);
if ($this->rectangle()->hasBorder()) {

3
src/Drivers/Imagick/Modifiers/FillModifier.php
View File

@@ -25,7 +25,8 @@ class FillModifier implements ModifierInterface
public function apply(ImageInterface $image): ImageInterface
{
$pixel = $this->colorToPixel($this->color);
$pixel = $this->colorToPixel($this->color, $image->getColorspace());
foreach ($image as $frame) {
if ($this->hasPosition()) {
$this->floodFillWithColor($frame, $pixel);

2
src/Drivers/Imagick/Modifiers/PadModifier.php
View File

@@ -61,7 +61,7 @@ class PadModifier extends AbstractPadModifier implements ModifierInterface
// draw background color on canvas
$draw = new ImagickDraw();
$draw->setFillColor($this->colorToPixel($background));
$draw->setFillColor($this->colorToPixel($background, $canvas->getColorspace()));
$draw->rectangle(0, 0, $canvas->getImageWidth(), $canvas->getImageHeight());
$canvas->drawImage($draw);

2
src/Drivers/Imagick/Modifiers/RotateModifier.php
View File

@@ -15,7 +15,7 @@ class RotateModifier extends AbstractRotateModifier implements ModifierInterface
{
foreach ($image as $frame) {
$frame->getCore()->rotateImage(
$this->colorToPixel($this->backgroundColor()),
$this->colorToPixel($this->backgroundColor(), $image->getColorspace()),
$this->rotationAngle()
);
}

2
src/Drivers/Imagick/Modifiers/TextWriter.php
View File

@@ -16,7 +16,7 @@ class TextWriter extends AbstractTextWriter
foreach ($image as $frame) {
foreach ($lines as $line) {
$frame->getCore()->annotateImage(
$font->toImagickDraw(),
$font->toImagickDraw($image->getColorspace()),
$line->getPosition()->getX(),
$line->getPosition()->getY(),
$font->getAngle(),

33
src/Drivers/Imagick/Traits/CanHandleColors.php
View File

@@ -4,7 +4,17 @@ namespace Intervention\Image\Drivers\Imagick\Traits;
use Imagick;
use ImagickPixel;
use Intervention\Image\Colors\Cmyk\Channels\Cyan;
use Intervention\Image\Colors\Cmyk\Channels\Key;
use Intervention\Image\Colors\Cmyk\Channels\Magenta;
use Intervention\Image\Colors\Cmyk\Channels\Yellow;
use Intervention\Image\Colors\Cmyk\Colorspace as CmykColorspace;
use Intervention\Image\Colors\Cmyk\Color as CmykColor;
use Intervention\Image\Colors\Rgb\Color as RgbColor;
use Intervention\Image\Colors\Rgb\Channels\Alpha;
use Intervention\Image\Colors\Rgb\Channels\Blue;
use Intervention\Image\Colors\Rgb\Channels\Green;
use Intervention\Image\Colors\Rgb\Channels\Red;
use Intervention\Image\Interfaces\ColorInterface;
use Intervention\Image\Interfaces\ColorspaceInterface;
@@ -41,8 +51,27 @@ trait CanHandleColors
* @param ColorInterface $color
* @return ImagickPixel
*/
public function colorToPixel(ColorInterface $color): ImagickPixel
public function colorToPixel(ColorInterface $color, ColorspaceInterface $colorspace): ImagickPixel
{
return new ImagickPixel($color->toString());
$pixel = new ImagickPixel();
$color = $color->convertTo($colorspace);
switch (get_class($color)) {
case CmykColor::class:
$pixel->setColorValue(Imagick::COLOR_CYAN, $color->channel(Cyan::class)->normalize());
$pixel->setColorValue(Imagick::COLOR_MAGENTA, $color->channel(Magenta::class)->normalize());
$pixel->setColorValue(Imagick::COLOR_YELLOW, $color->channel(Yellow::class)->normalize());
$pixel->setColorValue(Imagick::COLOR_BLACK, $color->channel(Key::class)->normalize());
break;
case RgbColor::class:
$pixel->setColorValue(Imagick::COLOR_RED, $color->channel(Red::class)->normalize());
$pixel->setColorValue(Imagick::COLOR_GREEN, $color->channel(Green::class)->normalize());
$pixel->setColorValue(Imagick::COLOR_BLUE, $color->channel(Blue::class)->normalize());
$pixel->setColorValue(Imagick::COLOR_ALPHA, $color->channel(Alpha::class)->normalize());
break;
}
return $pixel;
}
}

14
src/Drivers/Imagick/Traits/CanReadColors.php
View File

@@ -1,14 +0,0 @@
<?php
namespace Intervention\Image\Drivers\Imagick\Traits;
use ImagickPixel;
use Intervention\Image\Interfaces\ColorInterface;
trait CanReadColors
{
public function colorToPixel(ColorInterface $color): ImagickPixel
{
return new ImagickPixel($color->toString());
}
}

2
tests/Colors/Cmyk/ColorTest.php
View File

@@ -64,6 +64,6 @@ class ColorTest extends TestCase
public function testToString(): void
{
$color = new Color(100, 50, 20, 0);
$this->assertEquals('cmyk(100, 50, 20, 0)', (string) $color);
$this->assertEquals('cmyk(100%, 50%, 20%, 0%)', (string) $color);
}
}

58
tests/Drivers/Imagick/Traits/CanHandleColorsTest.php Normal file
View File

@@ -0,0 +1,58 @@
<?php
namespace Intervention\Image\Tests\Drivers\Imagick\Traits;
use Imagick;
use ImagickPixel;
use Intervention\Image\Colors\Cmyk\Color as CmykColor;
use Intervention\Image\Colors\Cmyk\Colorspace as CmykColorspace;
use Intervention\Image\Colors\Rgb\Color as RgbColor;
use Intervention\Image\Colors\Rgb\Colorspace as RgbColorspace;
use Intervention\Image\Drivers\Imagick\Traits\CanHandleColors;
use Intervention\Image\Tests\TestCase;
/**
* @requires extension imagick
* @covers \Intervention\Image\Drivers\Imagick\Traits\CanHandleColors
*/
class CanHandleColorsTest extends TestCase
{
protected function getAnonymousTrait()
{
return new class()
{
use CanHandleColors;
};
}
public function testColorFromPixel(): void
{
$result = $this->getAnonymousTrait()
->colorFromPixel(new ImagickPixel(), new RgbColorspace());
$this->assertInstanceOf(RgbColor::class, $result);
$result = $this->getAnonymousTrait()
->colorFromPixel(new ImagickPixel('rgba(10, 20, 30, .2)'), new RgbColorspace());
$this->assertInstanceOf(RgbColor::class, $result);
$this->assertEquals([10, 20, 30, 51], $result->toArray());
$result = $this->getAnonymousTrait()
->colorFromPixel(new ImagickPixel('cmyk(10%, 20%, 30%, 40%)'), new CmykColorspace());
$this->assertInstanceOf(CmykColor::class, $result);
$this->assertEquals([10, 20, 30, 40], $result->toArray());
}
public function testColorToPixel(): void
{
$result = $this->getAnonymousTrait()->colorToPixel(new RgbColor(10, 20, 30), new RgbColorspace());
$this->assertInstanceOf(ImagickPixel::class, $result);
$this->assertEquals('srgb(10,20,30)', $result->getColorAsString());
$result = $this->getAnonymousTrait()->colorToPixel(new CmykColor(100, 50, 25, 0), new CmykColorspace());
$this->assertInstanceOf(ImagickPixel::class, $result);
$this->assertEquals(1, $result->getColorValue(Imagick::COLOR_CYAN));
$this->assertEquals(.5, round($result->getColorValue(Imagick::COLOR_MAGENTA), 2));
$this->assertEquals(.25, round($result->getColorValue(Imagick::COLOR_YELLOW), 2));
$this->assertEquals(0, $result->getColorValue(Imagick::COLOR_BLACK));
}
}