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

added possibility to mask with mixed sources

Browse Source
This commit is contained in:
Oliver Vogel
2013-04-14 13:34:38 +02:00
parent 667f4550b5
commit 61a73c78bf
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -832,17 +832,17 @@ class Image
/**
* Apply given image as alpha mask on current image
*
* @param mixed $file
* @param mixed $source
* @param boolean $mask_with_alpha
* @return Image
*/
public function mask($file, $mask_with_alpha = false)
public function mask($source, $mask_with_alpha = false)
{
// create new empty image
$maskedImage = new Image(null, $this->width, $this->height);
// create mask
$mask = is_a($file, 'Intervention\Image\Image') ? $file : (new Image($file));
$mask = is_a($source, 'Intervention\Image\Image') ? $source : (new Image($source));
// resize mask to size of current image (if necessary)
if ($mask->width != $this->width || $mask->height != $this->height) {