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

Merge branch 'next' into next-method-renaming

Browse Source
This commit is contained in:
Oliver Vogel
2023-10-26 16:14:55 +02:00
parent 43d37541db f99170a9bd
commit a348c45cd9
4 changed files with 36 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -219,6 +219,11 @@ abstract class AbstractImage implements ImageInterface
);
}
/**
* {@inheritdoc}
*
* @see ImageInterface::pickColors()
*/
public function pickColors(int $x, int $y): CollectionInterface
{
$colors = new Collection();

12
src/Drivers/Gd/Image.php
View File

@@ -78,15 +78,11 @@ class Image extends AbstractImage implements ImageInterface, IteratorAggregate
return imagesy($this->frame()->getCore());
}
public function pickColor(int $x, int $y, int $frame_key = 0): ?ColorInterface
public function pickColor(int $x, int $y, int $frame_key = 0): ColorInterface
{
if ($frame = $this->frame($frame_key)) {
return $this->integerToColor(
imagecolorat($frame->getCore(), $x, $y)
);
}
return null;
return $this->integerToColor(
imagecolorat($this->frame($frame_key)->getCore(), $x, $y)
);
}
/**

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

@@ -134,16 +134,17 @@ class Image extends AbstractImage implements ImageInterface, Iterator
return $this->frame()->getCore()->getImageHeight();
}
public function pickColor(int $x, int $y, int $frame_key = 0): ?ColorInterface
/**
* {@inheritdoc}
*
* @see ImageInterface::pickColor()
*/
public function pickColor(int $x, int $y, int $frame_key = 0): ColorInterface
{
if ($frame = $this->frame($frame_key)) {
return $this->pixelToColor(
$frame->getCore()->getImagePixelColor($x, $y),
$this->getColorspace()
);
}
return null;
return $this->pixelToColor(
$this->frame($frame_key)->getCore()->getImagePixelColor($x, $y),
$this->getColorspace()
);
}
public function getColorspace(): ColorspaceInterface

18
src/Interfaces/ImageInterface.php
View File

@@ -137,7 +137,23 @@ interface ImageInterface extends Traversable, Countable
*/
public function toPng(): EncodedImage;
public function pickColor(int $x, int $y, int $frame_key = 0): ?ColorInterface;
/**
* Return color of pixel at given position on given frame position
*
* @param int $x
* @param int $y
* @param int $frame_key
* @return ColorInterface
*/
public function pickColor(int $x, int $y, int $frame_key = 0): ColorInterface;
/**
* Return all colors of pixel at given position for all frames of image
*
* @param int $x
* @param int $y
* @return ColorInterface
*/
public function pickColors(int $x, int $y): CollectionInterface;
/**