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

Merge branch 'pngopt'

Browse Source
This commit is contained in:
Oliver Vogel
2013-04-24 17:06:26 +02:00
parent 8c10b98c7d e7294fa6ba
commit 55f51743f6
3 changed files with 98 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
public/png8.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 177 B

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

@@ -1162,6 +1162,41 @@ class Image
return $this;
}
/**
* Set a maximum number of colors for the current image
*
* @param integer $count
* @param mixed $matte
* @return Image
*/
public function limitColors($count = null, $matte = null)
{
// create empty canvas
$resource = imagecreatetruecolor($this->width, $this->height);
// define matte
$matte = is_null($matte) ? imagecolorallocatealpha($resource, 0, 0, 0, 127) : $this->parseColor($matte);
// fill with matte and copy original image
imagefill($resource, 0, 0, $matte);
// set transparency
imagecolortransparent($resource, $matte);
// copy original image
imagecopy($resource, $this->resource, 0, 0, 0, 0, $this->width, $this->height);
if (is_numeric($count) && $count <= 256) {
// decrease colors
imagetruecolortopalette($resource, true, intval($count));
}
// set new resource
$this->resource = $resource;
return $this;
}
/**
* Reset to original image resource
*
@@ -1425,6 +1460,26 @@ class Image
return (is_resource($input) && get_resource_type($input) == 'gd');
}
/**
* Checks if the current image has (half) transparent pixels
*
* @return boolean
*/
private function hasTransparency()
{
$step_x = min(max(floor($this->width/50), 1), 10);
$step_y = min(max(floor($this->height/50), 1), 10);
for ($x=0; $x<$this->width; $x=$x+$step_x) {
for ($y=0; $y<$this->height; $y=$y+$step_y) {
$color = $this->pickColor($x, $y);
if ($color['a'] < 1) return true;
}
}
return false;
}
/**
* Returns image stream
*

43
tests/ImageTest.php
View File

@@ -1193,6 +1193,49 @@ class ImageTest extends PHPUnit_Framework_Testcase
$this->assertEquals($img->height, 600);
}
public function testLimitColors()
{
// reduce colors
$img = Image::make('public/test.jpg');
$img->limitColors(10);
$this->assertEquals(imagecolorstotal($img->resource), 11);
// reduce colors + keep transparency with matte
$img = Image::make('public/mask2.png');
$img->limitColors(10, '#ff0000'); // red matte
$this->assertEquals(imagecolorstotal($img->resource), 11);
$color1 = $img->pickColor(0, 0); // full transparent
$color2 = $img->pickColor(9, 17); // part of matte gradient
$this->assertEquals($color1['r'], 255);
$this->assertEquals($color1['g'], 0);
$this->assertEquals($color1['b'], 0);
$this->assertEquals($color1['a'], 0);
$this->assertEquals($color2['r'], 252);
$this->assertEquals($color2['g'], 10);
$this->assertEquals($color2['b'], 11);
$this->assertEquals($color2['a'], 1);
// increase colors
$img = Image::make('public/png8.png');
$img->limitColors(null); // set image to true color
$this->assertEquals(imagecolorstotal($img->resource), 0);
// increase colors + keep transparency with matte
$img = Image::make('public/png8.png');
$img->limitColors(null); // set image to true color
$this->assertEquals(imagecolorstotal($img->resource), 0);
$color1 = $img->pickColor(0, 0); // full transparent
$color2 = $img->pickColor(10, 10); // solid color
$this->assertEquals($color1['r'], 0);
$this->assertEquals($color1['g'], 0);
$this->assertEquals($color1['b'], 0);
$this->assertEquals($color1['a'], 0);
$this->assertEquals($color2['r'], 140);
$this->assertEquals($color2['g'], 140);
$this->assertEquals($color2['b'], 140);
$this->assertEquals($color2['a'], 1);
}
public function testSaveImage()
{
$save_as = 'public/test2.jpg';