1
0
mirror of https://github.com/Intervention/image.git synced 2025-08-22 13:32:56 +02:00

Merge pull request #356 from olivervogel/master

changes
This commit is contained in:
Oliver Vogel
2015-04-22 18:05:20 +02:00
6 changed files with 8 additions and 4 deletions

View File

@@ -19,6 +19,10 @@ class BackupCommand extends \Intervention\Image\Commands\AbstractCommand
$clone = imagecreatetruecolor($size->width, $size->height); $clone = imagecreatetruecolor($size->width, $size->height);
imagealphablending($clone, false); imagealphablending($clone, false);
imagesavealpha($clone, true); imagesavealpha($clone, true);
$transparency = imagecolorallocatealpha($clone, 0, 0, 0, 127);
imagefill($clone, 0, 0, $transparency);
// copy image to clone
imagecopy($clone, $image->getCore(), 0, 0, 0, 0, $size->width, $size->height); imagecopy($clone, $image->getCore(), 0, 0, 0, 0, $size->width, $size->height);
$image->setBackup($clone, $backupName); $image->setBackup($clone, $backupName);

View File

@@ -20,7 +20,7 @@ class ResizeCommand extends \Intervention\Image\Commands\AbstractCommand
$resized = $image->getSize()->resize($width, $height, $constraints); $resized = $image->getSize()->resize($width, $height, $constraints);
// modify image // modify image
$image->getCore()->resizeImage($resized->getWidth(), $resized->getHeight(), \Imagick::FILTER_BOX, 1); $image->getCore()->scaleImage($resized->getWidth(), $resized->getHeight());
return true; return true;
} }

View File

@@ -33,7 +33,7 @@ class HeightenCommandTest extends PHPUnit_Framework_TestCase
{ {
$callback = function ($constraint) { $constraint->upsize(); }; $callback = function ($constraint) { $constraint->upsize(); };
$imagick = Mockery::mock('Imagick'); $imagick = Mockery::mock('Imagick');
$imagick->shouldReceive('resizeimage')->with(300, 200, \Imagick::FILTER_BOX, 1)->once()->andReturn(true); $imagick->shouldReceive('scaleimage')->with(300, 200)->once()->andReturn(true);
$size = Mockery::mock('Intervention\Image\Size', array(800, 600)); $size = Mockery::mock('Intervention\Image\Size', array(800, 600));
$size->shouldReceive('resize')->once()->andReturn($size); $size->shouldReceive('resize')->once()->andReturn($size);
$size->shouldReceive('getWidth')->once()->andReturn(300); $size->shouldReceive('getWidth')->once()->andReturn(300);

View File

@@ -33,7 +33,7 @@ class resizeCommandTest extends PHPUnit_Framework_TestCase
{ {
$callback = function ($constraint) { $constraint->upsize(); }; $callback = function ($constraint) { $constraint->upsize(); };
$imagick = Mockery::mock('Imagick'); $imagick = Mockery::mock('Imagick');
$imagick->shouldReceive('resizeimage')->with(300, 200, \Imagick::FILTER_BOX, 1)->once()->andReturn(true); $imagick->shouldReceive('scaleimage')->with(300, 200)->once()->andReturn(true);
$size = Mockery::mock('Intervention\Image\Size', array(800, 600)); $size = Mockery::mock('Intervention\Image\Size', array(800, 600));
$size->shouldReceive('resize')->with(300, 200, $callback)->once()->andReturn($size); $size->shouldReceive('resize')->with(300, 200, $callback)->once()->andReturn($size);
$size->shouldReceive('getWidth')->once()->andReturn(300); $size->shouldReceive('getWidth')->once()->andReturn(300);

View File

@@ -33,7 +33,7 @@ class WidenCommandTest extends PHPUnit_Framework_TestCase
{ {
$callback = function ($constraint) { $constraint->upsize(); }; $callback = function ($constraint) { $constraint->upsize(); };
$imagick = Mockery::mock('Imagick'); $imagick = Mockery::mock('Imagick');
$imagick->shouldReceive('resizeimage')->with(300, 200, \Imagick::FILTER_BOX, 1)->once()->andReturn(true); $imagick->shouldReceive('scaleimage')->with(300, 200)->once()->andReturn(true);
$size = Mockery::mock('Intervention\Image\Size', array(800, 600)); $size = Mockery::mock('Intervention\Image\Size', array(800, 600));
$size->shouldReceive('resize')->once()->andReturn($size); $size->shouldReceive('resize')->once()->andReturn($size);
$size->shouldReceive('getWidth')->once()->andReturn(300); $size->shouldReceive('getWidth')->once()->andReturn(300);

Binary file not shown.

Before

Width:  |  Height:  |  Size: 170 B