From ce66ea8560421deeef6032745fb1053c1d7ab193 Mon Sep 17 00:00:00 2001 From: Oliver Vogel Date: Tue, 13 May 2014 17:42:12 +0200 Subject: [PATCH] replaced deprecated methods --- src/Intervention/Image/Imagick/Commands/FillCommand.php | 4 ++-- .../Image/Imagick/Commands/LimitColorsCommand.php | 2 +- .../Image/Imagick/Commands/ResizeCanvasCommand.php | 2 +- tests/FillCommandTest.php | 2 +- tests/LimitColorsCommandTest.php | 2 +- tests/ResizeCanvasCommandTest.php | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Intervention/Image/Imagick/Commands/FillCommand.php b/src/Intervention/Image/Imagick/Commands/FillCommand.php index d36d456a..2ea205c8 100644 --- a/src/Intervention/Image/Imagick/Commands/FillCommand.php +++ b/src/Intervention/Image/Imagick/Commands/FillCommand.php @@ -37,7 +37,7 @@ class FillCommand extends \Intervention\Image\Commands\AbstractCommand $tile = clone $image->getCore(); // mask away color at position - $tile->paintTransparentImage($tile->getImagePixelColor($x, $y), 0, 0); + $tile->transparentPaintImage($tile->getImagePixelColor($x, $y), 0, 0, false); // create canvas $canvas = clone $image->getCore(); @@ -62,7 +62,7 @@ class FillCommand extends \Intervention\Image\Commands\AbstractCommand $tile = clone $image->getCore(); // mask away color at pos. - $tile->paintTransparentImage($tile->getImagePixelColor($x, $y), 0, 0); + $tile->transparentPaintImage($tile->getImagePixelColor($x, $y), 0, 0, false); // save alpha channel of original image $alpha = clone $image->getCore(); diff --git a/src/Intervention/Image/Imagick/Commands/LimitColorsCommand.php b/src/Intervention/Image/Imagick/Commands/LimitColorsCommand.php index abb12b1c..5befd4fe 100644 --- a/src/Intervention/Image/Imagick/Commands/LimitColorsCommand.php +++ b/src/Intervention/Image/Imagick/Commands/LimitColorsCommand.php @@ -15,7 +15,7 @@ class LimitColorsCommand extends \Intervention\Image\Commands\AbstractCommand // build 2 color alpha mask from original alpha $alpha = clone $image->getCore(); $alpha->separateImageChannel(\Imagick::CHANNEL_ALPHA); - $alpha->paintTransparentImage('#ffffff', 0, 0); + $alpha->transparentPaintImage('#ffffff', 0, 0, false); $alpha->separateImageChannel(\Imagick::CHANNEL_ALPHA); $alpha->negateImage(false); diff --git a/src/Intervention/Image/Imagick/Commands/ResizeCanvasCommand.php b/src/Intervention/Image/Imagick/Commands/ResizeCanvasCommand.php index 6316fe83..23055ba2 100644 --- a/src/Intervention/Image/Imagick/Commands/ResizeCanvasCommand.php +++ b/src/Intervention/Image/Imagick/Commands/ResizeCanvasCommand.php @@ -66,7 +66,7 @@ class ResizeCanvasCommand extends \Intervention\Image\Commands\AbstractCommand $rect->setFillColor($fill); $rect->rectangle($dst_x, $dst_y, $dst_x + $src_w - 1, $dst_y + $src_h - 1); $canvas->getCore()->drawImage($rect); - $canvas->getCore()->paintTransparentImage($fill, 0, 0); + $canvas->getCore()->transparentPaintImage($fill, 0, 0, false); // copy image into new canvas $image->getCore()->cropImage($src_w, $src_h, $src_x, $src_y); diff --git a/tests/FillCommandTest.php b/tests/FillCommandTest.php index aa378769..6a851fc2 100644 --- a/tests/FillCommandTest.php +++ b/tests/FillCommandTest.php @@ -55,7 +55,7 @@ class FillCommandTest extends PHPUnit_Framework_TestCase { $imagick = Mockery::mock('Imagick'); $imagick->shouldReceive('getimagepixelcolor')->once()->andReturn('#000000'); - $imagick->shouldReceive('painttransparentimage')->once()->andReturn(true); + $imagick->shouldReceive('transparentpaintimage')->once()->andReturn(true); $imagick->shouldReceive('compositeimage')->times(3)->andReturn(true); $image = Mockery::mock('Intervention\Image\Image'); $image->shouldReceive('getCore')->andReturn($imagick); diff --git a/tests/LimitColorsCommandTest.php b/tests/LimitColorsCommandTest.php index f0d4eefb..18134308 100644 --- a/tests/LimitColorsCommandTest.php +++ b/tests/LimitColorsCommandTest.php @@ -28,7 +28,7 @@ class LimitColorsCommandTest extends PHPUnit_Framework_TestCase $size = Mockery::mock('\Intervention\Image\Size', array(32, 32)); $imagick = Mockery::mock('\Imagick'); $imagick->shouldReceive('separateimagechannel')->with(\Imagick::CHANNEL_ALPHA)->times(2); - $imagick->shouldReceive('painttransparentimage')->with('#ffffff', 0, 0)->once(); + $imagick->shouldReceive('transparentpaintimage')->with('#ffffff', 0, 0, false)->once(); $imagick->shouldReceive('negateimage')->with(false)->once(); $imagick->shouldReceive('quantizeimage')->with(16, \Imagick::COLORSPACE_RGB, 0, false, false)->once(); $imagick->shouldReceive('compositeimage')->once(); diff --git a/tests/ResizeCanvasCommandTest.php b/tests/ResizeCanvasCommandTest.php index e8f8866a..9326045f 100644 --- a/tests/ResizeCanvasCommandTest.php +++ b/tests/ResizeCanvasCommandTest.php @@ -55,7 +55,7 @@ class ResizeCanvasCommandTest extends PHPUnit_Framework_TestCase $imagick->shouldReceive('compositeimage')->with($imagick, 40, 0, 0)->once(); $imagick->shouldReceive('setimagepage')->with(0, 0, 0, 0)->once(); $imagick->shouldReceive('drawimage')->once(); - $imagick->shouldReceive('painttransparentimage')->once(); + $imagick->shouldReceive('transparentpaintimage')->once(); $canvas->shouldReceive('getCore')->times(5)->andReturn($imagick); $canvas->shouldReceive('getSize')->andReturn($canvas_size);