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

Respect maximum dimensions of image

Browse Source 
Moved feathering from the 'applying' part to the 'detection' part
This commit is contained in:
Menno Holtkamp
2014-04-03 00:48:40 +02:00
parent 67e865e1bc
commit c600aecc8d
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Intervention/Image/Image.php
View File

@@ -821,7 +821,7 @@ class Image
for ($x=0; $x < $this->width; $x++) { for ($x=0; $x < $this->width; $x++) {
$checkColor = imagecolorsforindex($this->resource, imagecolorat($this->resource, $x, $y)); $checkColor = imagecolorsforindex($this->resource, imagecolorat($this->resource, $x, $y));
if ($colorDiffers($color, $checkColor)) { if ($colorDiffers($color, $checkColor)) {
$top_y = $y; $top_y = max(0, $y - $feather);
break 2; break 2;
} }
} }
@@ -834,7 +834,7 @@ class Image
for ($y=$top_y; $y < $this->height; $y++) { for ($y=$top_y; $y < $this->height; $y++) {
$checkColor = imagecolorsforindex($this->resource, imagecolorat($this->resource, $x, $y)); $checkColor = imagecolorsforindex($this->resource, imagecolorat($this->resource, $x, $y));
if ($colorDiffers($color, $checkColor)) { if ($colorDiffers($color, $checkColor)) {
$top_x = $x; $top_x = max(0, $x - $feather);
break 2; break 2;
} }
} }
@@ -847,7 +847,7 @@ class Image
for ($x=$top_x; $x < $this->width; $x++) { for ($x=$top_x; $x < $this->width; $x++) {
$checkColor = imagecolorsforindex($this->resource, imagecolorat($this->resource, $x, $y)); $checkColor = imagecolorsforindex($this->resource, imagecolorat($this->resource, $x, $y));
if ($colorDiffers($color, $checkColor)) { if ($colorDiffers($color, $checkColor)) {
$bottom_y = $y+1; $bottom_y = min($this->height, $y+1 + $feather);
break 2; break 2;
} }
} }
@@ -860,15 +860,15 @@ class Image
for ($y=$top_y; $y < $bottom_y; $y++) { for ($y=$top_y; $y < $bottom_y; $y++) {
$checkColor = imagecolorsforindex($this->resource, imagecolorat($this->resource, $x, $y)); $checkColor = imagecolorsforindex($this->resource, imagecolorat($this->resource, $x, $y));
if ($colorDiffers($color, $checkColor)) { if ($colorDiffers($color, $checkColor)) {
$bottom_x = $x+1; $bottom_x = min($this->width, $x+1 + $feather);
break 2; break 2;
} }
} }
} }
} }
// trim parts of image, taking a possible feathering range into account // trim parts of image
$this->modify(0, 0, max(0, $top_x - $feather), max(0, $top_y - $feather), ($bottom_x-$top_x) + (2 * $feather), ($bottom_y-$top_y) + (2 * $feather), ($bottom_x-$top_x) + (2 * $feather), ($bottom_y-$top_y) + (2 * $feather)); $this->modify(0, 0, $top_x, $top_y, ($bottom_x-$top_x), ($bottom_y-$top_y), ($bottom_x-$top_x), ($bottom_y-$top_y));
return $this; return $this;
} }