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

memory improvements

Browse Source
This commit is contained in:
Oliver Vogel
2014-03-13 19:21:07 +01:00
parent 901ba84a74
commit c3ab2f72e9
2 changed files with 24 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -261,7 +261,7 @@ class Image
imagefill($this->resource, 0, 0, $bgcolor); imagefill($this->resource, 0, 0, $bgcolor);
// save current state as original // save current state as original
$this->backup(); // $this->backup();
} }
/** /**
@@ -1842,7 +1842,7 @@ class Image
} }
// save current state as original // save current state as original
$this->backup(); // $this->backup();
} }
/** /**
@@ -1857,7 +1857,7 @@ class Image
$this->height = imagesy($this->resource); $this->height = imagesy($this->resource);
// save current state as original // save current state as original
$this->backup(); // $this->backup();
} }
/** /**
@@ -1883,7 +1883,7 @@ class Image
$this->height = imagesy($this->resource); $this->height = imagesy($this->resource);
// save current state as original // save current state as original
$this->backup(); // $this->backup();
} }
/** /**

39
tests/ImageTest.php
View File

@@ -699,10 +699,10 @@ class ImageTest extends PHPUnit_Framework_Testcase
public function testInsertImage() public function testInsertImage()
{ {
$img = Image::canvas(32, 32, '#ff0000'); // create canvas
$watermark = Image::canvas(16, 16, '#0000ff'); // create watermark $watermark = Image::canvas(16, 16, '#0000ff'); // create watermark
// top-left anchor // top-left anchor
$img = Image::canvas(32, 32, '#ff0000'); // create canvas
$img->insert($watermark, 0, 0, 'top-left'); $img->insert($watermark, 0, 0, 'top-left');
$this->assertInstanceOf('Intervention\Image\Image', $img); $this->assertInstanceOf('Intervention\Image\Image', $img);
$this->assertInternalType('int', $img->width); $this->assertInternalType('int', $img->width);
@@ -711,9 +711,9 @@ class ImageTest extends PHPUnit_Framework_Testcase
$this->assertEquals($img->height, 32); $this->assertEquals($img->height, 32);
$this->assertEquals('#0000ff', $img->pickColor(0, 0, 'hex')); $this->assertEquals('#0000ff', $img->pickColor(0, 0, 'hex'));
$this->assertEquals('#ff0000', $img->pickColor(16, 16, 'hex')); $this->assertEquals('#ff0000', $img->pickColor(16, 16, 'hex'));
$img->reset();
// top-left anchor coordinates // top-left anchor coordinates
$img = Image::canvas(32, 32, '#ff0000'); // create canvas
$img->insert($watermark, 10, 10, 'top-left'); $img->insert($watermark, 10, 10, 'top-left');
$this->assertInstanceOf('Intervention\Image\Image', $img); $this->assertInstanceOf('Intervention\Image\Image', $img);
$this->assertInternalType('int', $img->width); $this->assertInternalType('int', $img->width);
@@ -722,9 +722,9 @@ class ImageTest extends PHPUnit_Framework_Testcase
$this->assertEquals($img->height, 32); $this->assertEquals($img->height, 32);
$this->assertEquals('#ff0000', $img->pickColor(9, 9, 'hex')); $this->assertEquals('#ff0000', $img->pickColor(9, 9, 'hex'));
$this->assertEquals('#0000ff', $img->pickColor(10, 10, 'hex')); $this->assertEquals('#0000ff', $img->pickColor(10, 10, 'hex'));
$img->reset();
// top anchor // top anchor
$img = Image::canvas(32, 32, '#ff0000'); // create canvas
$img->insert($watermark, 0, 0, 'top'); $img->insert($watermark, 0, 0, 'top');
$this->assertInstanceOf('Intervention\Image\Image', $img); $this->assertInstanceOf('Intervention\Image\Image', $img);
$this->assertInternalType('int', $img->width); $this->assertInternalType('int', $img->width);
@@ -733,9 +733,9 @@ class ImageTest extends PHPUnit_Framework_Testcase
$this->assertEquals($img->height, 32); $this->assertEquals($img->height, 32);
$this->assertEquals('#ff0000', $img->pickColor(0, 0, 'hex')); $this->assertEquals('#ff0000', $img->pickColor(0, 0, 'hex'));
$this->assertEquals('#0000ff', $img->pickColor(23, 15, 'hex')); $this->assertEquals('#0000ff', $img->pickColor(23, 15, 'hex'));
$img->reset();
// top anchor coordinates // top anchor coordinates
$img = Image::canvas(32, 32, '#ff0000'); // create canvas
$img->insert($watermark, 10, 10, 'top'); $img->insert($watermark, 10, 10, 'top');
$this->assertInstanceOf('Intervention\Image\Image', $img); $this->assertInstanceOf('Intervention\Image\Image', $img);
$this->assertInternalType('int', $img->width); $this->assertInternalType('int', $img->width);
@@ -744,9 +744,9 @@ class ImageTest extends PHPUnit_Framework_Testcase
$this->assertEquals($img->height, 32); $this->assertEquals($img->height, 32);
$this->assertEquals('#0000ff', $img->pickColor(18, 10, 'hex')); $this->assertEquals('#0000ff', $img->pickColor(18, 10, 'hex'));
$this->assertEquals('#ff0000', $img->pickColor(31, 26, 'hex')); $this->assertEquals('#ff0000', $img->pickColor(31, 26, 'hex'));
$img->reset();
// top-right anchor // top-right anchor
$img = Image::canvas(32, 32, '#ff0000'); // create canvas
$img->insert($watermark, 0, 0, 'top-right'); $img->insert($watermark, 0, 0, 'top-right');
$this->assertInstanceOf('Intervention\Image\Image', $img); $this->assertInstanceOf('Intervention\Image\Image', $img);
$this->assertInternalType('int', $img->width); $this->assertInternalType('int', $img->width);
@@ -755,9 +755,9 @@ class ImageTest extends PHPUnit_Framework_Testcase
$this->assertEquals($img->height, 32); $this->assertEquals($img->height, 32);
$this->assertEquals('#ff0000', $img->pickColor(15, 0, 'hex')); $this->assertEquals('#ff0000', $img->pickColor(15, 0, 'hex'));
$this->assertEquals('#0000ff', $img->pickColor(31, 0, 'hex')); $this->assertEquals('#0000ff', $img->pickColor(31, 0, 'hex'));
$img->reset();
// top-right anchor coordinates // top-right anchor coordinates
$img = Image::canvas(32, 32, '#ff0000'); // create canvas
$img->insert($watermark, 10, 10, 'top-right'); $img->insert($watermark, 10, 10, 'top-right');
$this->assertInstanceOf('Intervention\Image\Image', $img); $this->assertInstanceOf('Intervention\Image\Image', $img);
$this->assertInternalType('int', $img->width); $this->assertInternalType('int', $img->width);
@@ -766,9 +766,9 @@ class ImageTest extends PHPUnit_Framework_Testcase
$this->assertEquals($img->height, 32); $this->assertEquals($img->height, 32);
$this->assertEquals('#ff0000', $img->pickColor(6, 9, 'hex')); $this->assertEquals('#ff0000', $img->pickColor(6, 9, 'hex'));
$this->assertEquals('#0000ff', $img->pickColor(21, 25, 'hex')); $this->assertEquals('#0000ff', $img->pickColor(21, 25, 'hex'));
$img->reset();
// left anchor // left anchor
$img = Image::canvas(32, 32, '#ff0000'); // create canvas
$img->insert($watermark, 0, 0, 'left'); $img->insert($watermark, 0, 0, 'left');
$this->assertInstanceOf('Intervention\Image\Image', $img); $this->assertInstanceOf('Intervention\Image\Image', $img);
$this->assertInternalType('int', $img->width); $this->assertInternalType('int', $img->width);
@@ -777,9 +777,9 @@ class ImageTest extends PHPUnit_Framework_Testcase
$this->assertEquals($img->height, 32); $this->assertEquals($img->height, 32);
$this->assertEquals('#0000ff', $img->pickColor(15, 23, 'hex')); $this->assertEquals('#0000ff', $img->pickColor(15, 23, 'hex'));
$this->assertEquals('#ff0000', $img->pickColor(0, 7, 'hex')); $this->assertEquals('#ff0000', $img->pickColor(0, 7, 'hex'));
$img->reset();
// left anchor coordinates // left anchor coordinates
$img = Image::canvas(32, 32, '#ff0000'); // create canvas
$img->insert($watermark, 10, 10, 'left'); $img->insert($watermark, 10, 10, 'left');
$this->assertInstanceOf('Intervention\Image\Image', $img); $this->assertInstanceOf('Intervention\Image\Image', $img);
$this->assertInternalType('int', $img->width); $this->assertInternalType('int', $img->width);
@@ -788,9 +788,9 @@ class ImageTest extends PHPUnit_Framework_Testcase
$this->assertEquals($img->height, 32); $this->assertEquals($img->height, 32);
$this->assertEquals('#0000ff', $img->pickColor(25, 31, 'hex')); $this->assertEquals('#0000ff', $img->pickColor(25, 31, 'hex'));
$this->assertEquals('#ff0000', $img->pickColor(10, 17, 'hex')); $this->assertEquals('#ff0000', $img->pickColor(10, 17, 'hex'));
$img->reset();
// right anchor // right anchor
$img = Image::canvas(32, 32, '#ff0000'); // create canvas
$img->insert($watermark, 0, 0, 'right'); $img->insert($watermark, 0, 0, 'right');
$this->assertInstanceOf('Intervention\Image\Image', $img); $this->assertInstanceOf('Intervention\Image\Image', $img);
$this->assertInternalType('int', $img->width); $this->assertInternalType('int', $img->width);
@@ -799,9 +799,9 @@ class ImageTest extends PHPUnit_Framework_Testcase
$this->assertEquals($img->height, 32); $this->assertEquals($img->height, 32);
$this->assertEquals('#0000ff', $img->pickColor(31, 23, 'hex')); $this->assertEquals('#0000ff', $img->pickColor(31, 23, 'hex'));
$this->assertEquals('#ff0000', $img->pickColor(15, 15, 'hex')); $this->assertEquals('#ff0000', $img->pickColor(15, 15, 'hex'));
$img->reset();
// right anchor coordinates // right anchor coordinates
$img = Image::canvas(32, 32, '#ff0000'); // create canvas
$img->insert($watermark, 10, 10, 'right'); $img->insert($watermark, 10, 10, 'right');
$this->assertInstanceOf('Intervention\Image\Image', $img); $this->assertInstanceOf('Intervention\Image\Image', $img);
$this->assertInternalType('int', $img->width); $this->assertInternalType('int', $img->width);
@@ -810,9 +810,9 @@ class ImageTest extends PHPUnit_Framework_Testcase
$this->assertEquals($img->height, 32); $this->assertEquals($img->height, 32);
$this->assertEquals('#0000ff', $img->pickColor(21, 31, 'hex')); $this->assertEquals('#0000ff', $img->pickColor(21, 31, 'hex'));
$this->assertEquals('#ff0000', $img->pickColor(5, 18, 'hex')); $this->assertEquals('#ff0000', $img->pickColor(5, 18, 'hex'));
$img->reset();
// bottom-left anchor // bottom-left anchor
$img = Image::canvas(32, 32, '#ff0000'); // create canvas
$img->insert($watermark, 0, 0, 'bottom-left'); $img->insert($watermark, 0, 0, 'bottom-left');
$this->assertInstanceOf('Intervention\Image\Image', $img); $this->assertInstanceOf('Intervention\Image\Image', $img);
$this->assertInternalType('int', $img->width); $this->assertInternalType('int', $img->width);
@@ -821,9 +821,9 @@ class ImageTest extends PHPUnit_Framework_Testcase
$this->assertEquals($img->height, 32); $this->assertEquals($img->height, 32);
$this->assertEquals('#0000ff', $img->pickColor(15, 31, 'hex')); $this->assertEquals('#0000ff', $img->pickColor(15, 31, 'hex'));
$this->assertEquals('#ff0000', $img->pickColor(0, 15, 'hex')); $this->assertEquals('#ff0000', $img->pickColor(0, 15, 'hex'));
$img->reset();
// bottom-left anchor coordinates // bottom-left anchor coordinates
$img = Image::canvas(32, 32, '#ff0000'); // create canvas
$img->insert($watermark, 10, 10, 'bottom-left'); $img->insert($watermark, 10, 10, 'bottom-left');
$this->assertInstanceOf('Intervention\Image\Image', $img); $this->assertInstanceOf('Intervention\Image\Image', $img);
$this->assertInternalType('int', $img->width); $this->assertInternalType('int', $img->width);
@@ -832,9 +832,9 @@ class ImageTest extends PHPUnit_Framework_Testcase
$this->assertEquals($img->height, 32); $this->assertEquals($img->height, 32);
$this->assertEquals('#0000ff', $img->pickColor(10, 21, 'hex')); $this->assertEquals('#0000ff', $img->pickColor(10, 21, 'hex'));
$this->assertEquals('#ff0000', $img->pickColor(9, 20, 'hex')); $this->assertEquals('#ff0000', $img->pickColor(9, 20, 'hex'));
$img->reset();
// bottom anchor // bottom anchor
$img = Image::canvas(32, 32, '#ff0000'); // create canvas
$img->insert($watermark, 0, 0, 'bottom'); $img->insert($watermark, 0, 0, 'bottom');
$this->assertInstanceOf('Intervention\Image\Image', $img); $this->assertInstanceOf('Intervention\Image\Image', $img);
$this->assertInternalType('int', $img->width); $this->assertInternalType('int', $img->width);
@@ -843,9 +843,9 @@ class ImageTest extends PHPUnit_Framework_Testcase
$this->assertEquals($img->height, 32); $this->assertEquals($img->height, 32);
$this->assertEquals('#0000ff', $img->pickColor(8, 16, 'hex')); $this->assertEquals('#0000ff', $img->pickColor(8, 16, 'hex'));
$this->assertEquals('#ff0000', $img->pickColor(8, 15, 'hex')); $this->assertEquals('#ff0000', $img->pickColor(8, 15, 'hex'));
$img->reset();
// bottom anchor coordinates // bottom anchor coordinates
$img = Image::canvas(32, 32, '#ff0000'); // create canvas
$img->insert($watermark, 10, 10, 'bottom'); $img->insert($watermark, 10, 10, 'bottom');
$this->assertInstanceOf('Intervention\Image\Image', $img); $this->assertInstanceOf('Intervention\Image\Image', $img);
$this->assertInternalType('int', $img->width); $this->assertInternalType('int', $img->width);
@@ -854,9 +854,9 @@ class ImageTest extends PHPUnit_Framework_Testcase
$this->assertEquals($img->height, 32); $this->assertEquals($img->height, 32);
$this->assertEquals('#0000ff', $img->pickColor(18, 21, 'hex')); $this->assertEquals('#0000ff', $img->pickColor(18, 21, 'hex'));
$this->assertEquals('#ff0000', $img->pickColor(17, 21, 'hex')); $this->assertEquals('#ff0000', $img->pickColor(17, 21, 'hex'));
$img->reset();
// bottom-right anchor // bottom-right anchor
$img = Image::canvas(32, 32, '#ff0000'); // create canvas
$img->insert($watermark, 0, 0, 'bottom-right'); $img->insert($watermark, 0, 0, 'bottom-right');
$this->assertInstanceOf('Intervention\Image\Image', $img); $this->assertInstanceOf('Intervention\Image\Image', $img);
$this->assertInternalType('int', $img->width); $this->assertInternalType('int', $img->width);
@@ -865,9 +865,9 @@ class ImageTest extends PHPUnit_Framework_Testcase
$this->assertEquals($img->height, 32); $this->assertEquals($img->height, 32);
$this->assertEquals('#0000ff', $img->pickColor(16, 16, 'hex')); $this->assertEquals('#0000ff', $img->pickColor(16, 16, 'hex'));
$this->assertEquals('#ff0000', $img->pickColor(15, 16, 'hex')); $this->assertEquals('#ff0000', $img->pickColor(15, 16, 'hex'));
$img->reset();
// bottom-right anchor coordinates // bottom-right anchor coordinates
$img = Image::canvas(32, 32, '#ff0000'); // create canvas
$img->insert($watermark, 10, 10, 'bottom-right'); $img->insert($watermark, 10, 10, 'bottom-right');
$this->assertInstanceOf('Intervention\Image\Image', $img); $this->assertInstanceOf('Intervention\Image\Image', $img);
$this->assertInternalType('int', $img->width); $this->assertInternalType('int', $img->width);
@@ -876,9 +876,9 @@ class ImageTest extends PHPUnit_Framework_Testcase
$this->assertEquals($img->height, 32); $this->assertEquals($img->height, 32);
$this->assertEquals('#0000ff', $img->pickColor(21, 21, 'hex')); $this->assertEquals('#0000ff', $img->pickColor(21, 21, 'hex'));
$this->assertEquals('#ff0000', $img->pickColor(22, 22, 'hex')); $this->assertEquals('#ff0000', $img->pickColor(22, 22, 'hex'));
$img->reset();
// center anchor // center anchor
$img = Image::canvas(32, 32, '#ff0000'); // create canvas
$img->insert($watermark, 0, 0, 'center'); $img->insert($watermark, 0, 0, 'center');
$this->assertInstanceOf('Intervention\Image\Image', $img); $this->assertInstanceOf('Intervention\Image\Image', $img);
$this->assertInternalType('int', $img->width); $this->assertInternalType('int', $img->width);
@@ -887,9 +887,9 @@ class ImageTest extends PHPUnit_Framework_Testcase
$this->assertEquals($img->height, 32); $this->assertEquals($img->height, 32);
$this->assertEquals('#0000ff', $img->pickColor(23, 23, 'hex')); $this->assertEquals('#0000ff', $img->pickColor(23, 23, 'hex'));
$this->assertEquals('#ff0000', $img->pickColor(8, 7, 'hex')); $this->assertEquals('#ff0000', $img->pickColor(8, 7, 'hex'));
$img->reset();
// center anchor coordinates // center anchor coordinates
$img = Image::canvas(32, 32, '#ff0000'); // create canvas
$img->insert($watermark, 10, 10, 'center'); $img->insert($watermark, 10, 10, 'center');
$this->assertInstanceOf('Intervention\Image\Image', $img); $this->assertInstanceOf('Intervention\Image\Image', $img);
$this->assertInternalType('int', $img->width); $this->assertInternalType('int', $img->width);
@@ -898,7 +898,6 @@ class ImageTest extends PHPUnit_Framework_Testcase
$this->assertEquals($img->height, 32); $this->assertEquals($img->height, 32);
$this->assertEquals('#0000ff', $img->pickColor(31, 31, 'hex')); $this->assertEquals('#0000ff', $img->pickColor(31, 31, 'hex'));
$this->assertEquals('#ff0000', $img->pickColor(18, 17, 'hex')); $this->assertEquals('#ff0000', $img->pickColor(18, 17, 'hex'));
$img->reset();
} }
public function testInsertAfterResize() public function testInsertAfterResize()
@@ -1370,6 +1369,7 @@ class ImageTest extends PHPUnit_Framework_Testcase
public function testResetImage() public function testResetImage()
{ {
$img = $this->getTestImage(); $img = $this->getTestImage();
$img->backup();
$img->resize(300, 200); $img->resize(300, 200);
$img->reset(); $img->reset();
$this->assertInternalType('int', $img->width); $this->assertInternalType('int', $img->width);
@@ -1381,6 +1381,7 @@ class ImageTest extends PHPUnit_Framework_Testcase
public function testResetEmptyImage() public function testResetEmptyImage()
{ {
$img = new Image(null, 800, 600, '#0000ff'); $img = new Image(null, 800, 600, '#0000ff');
$img->backup();
$img->resize(300, 200); $img->resize(300, 200);
$img->fill('#00ff00'); $img->fill('#00ff00');
$img->reset(); $img->reset();