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

bugfix

Browse Source
This commit is contained in:
Oliver Vogel
2014-02-26 20:05:49 +01:00
parent 30355d7b60
commit 1bfd80ccac
2 changed files with 30 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -528,6 +528,8 @@ class Image
case 'left-top':
$src_x = 0;
$src_y = 0;
$dst_x = 0;
$dst_y = 0;
break;
case 'top':
@@ -537,12 +539,16 @@ class Image
case 'middle-top':
$src_x = ($width < $this->width) ? intval(($this->width - $width) / 2) : 0;
$src_y = 0;
$dst_x = ($width <= $this->width) ? 0 : intval(($width - $this->width) / 2);
$dst_y = 0;
break;
case 'top-right':
case 'right-top':
$src_x = ($width < $this->width) ? intval($this->width - $width) : 0;
$src_y = 0;
$dst_x = ($width <= $this->width) ? 0 : intval(($width - $this->width));
$dst_y = 0;
break;
case 'left':
@@ -552,6 +558,8 @@ class Image
case 'middle-left':
$src_x = 0;
$src_y = ($height < $this->height) ? intval(($this->height - $height) / 2) : 0;
$dst_x = 0;
$dst_y = ($height <= $this->height) ? 0 : intval(($height - $this->height) / 2);
break;
case 'right':
@@ -561,12 +569,16 @@ class Image
case 'middle-right':
$src_x = ($width < $this->width) ? intval($this->width - $width) : 0;
$src_y = ($height < $this->height) ? intval(($this->height - $height) / 2) : 0;
$dst_x = ($width <= $this->width) ? 0 : intval(($width - $this->width));
$dst_y = ($height <= $this->height) ? 0 : intval(($height - $this->height) / 2);
break;
case 'bottom-left':
case 'left-bottom':
$src_x = 0;
$src_y = ($height < $this->height) ? intval($this->height - $height) : 0;
$dst_x = 0;
$dst_y = ($height <= $this->height) ? 0 : intval(($height - $this->height));
break;
case 'bottom':
@@ -576,12 +588,16 @@ class Image
case 'middle-bottom':
$src_x = ($width < $this->width) ? intval(($this->width - $width) / 2) : 0;
$src_y = ($height < $this->height) ? intval($this->height - $height) : 0;
$dst_x = ($width <= $this->width) ? 0 : intval(($width - $this->width) / 2);
$dst_y = ($height <= $this->height) ? 0 : intval(($height - $this->height));
break;
case 'bottom-right':
case 'right-bottom':
$src_x = ($width < $this->width) ? intval($this->width - $width) : 0;
$src_y = ($height < $this->height) ? intval($this->height - $height) : 0;
$dst_x = ($width <= $this->width) ? 0 : intval(($width - $this->width));
$dst_y = ($height <= $this->height) ? 0 : intval(($height - $this->height));
break;
default:
@@ -591,13 +607,11 @@ class Image
case 'middle-middle':
$src_x = ($width < $this->width) ? intval(($this->width - $width) / 2) : 0;
$src_y = ($height < $this->height) ? intval(($this->height - $height) / 2) : 0;
$dst_x = ($width <= $this->width) ? 0 : intval(($width - $this->width) / 2);
$dst_y = ($height <= $this->height) ? 0 : intval(($height - $this->height) / 2);
break;
}
// define dest. pos
$dst_x = ($width <= $this->width) ? 0 : intval(($width - $this->width) / 2);
$dst_y = ($height <= $this->height) ? 0 : intval(($height - $this->height) / 2);
// copy content from resource
imagecopy($image, $this->resource, $dst_x, $dst_y, $src_x, $src_y, $src_w, $src_h);

12
tests/ImageTest.php
View File

@@ -522,6 +522,18 @@ class ImageTest extends PHPUnit_Framework_Testcase
$this->assertEquals($img->height, 400);
$this->assertEquals('#fffefc', $img->pickColor(0, 0, 'hex'));
$this->assertEquals('#ffa600', $img->pickColor(599, 399, 'hex'));
// resize to larger size with anchor and only height set
$img = $this->getTestImage();
$img->resizeCanvas(null, 650, 'bottom-left', false, '#00000');
$this->assertInstanceOf('Intervention\Image\Image', $img);
$this->assertInternalType('int', $img->width);
$this->assertInternalType('int', $img->height);
$this->assertEquals($img->width, 800);
$this->assertEquals($img->height, 650);
$this->assertEquals('#000000', $img->pickColor(0, 0, 'hex'));
$this->assertEquals('#ffffff', $img->pickColor(3, 50, 'hex'));
$this->assertEquals('#ffa600', $img->pickColor(799, 649, 'hex'));
}
public function testCropImage()