mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #10044 from owncloud/transparency_fix 

extract transparency fix from #8050
This commit is contained in:
Jan-Christoph Borchardt 2014-07-30 18:36:51 +02:00
parent 521934ee0d fa461befbc
commit 5b11a18dea
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/private/image.php
View File

@ -870,6 +870,14 @@ class OC_Image {
imagedestroy($process);
return false;
}
// preserve transparency
if($this->imageType == IMAGETYPE_GIF or $this->imageType == IMAGETYPE_PNG) {
imagecolortransparent($process, imagecolorallocatealpha($process, 0, 0, 0, 127));
imagealphablending($process, false);
imagesavealpha($process, true);
}
imagecopyresampled($process, $this->resource, 0, 0, $x, $y, $w, $h, $w, $h);
if ($process == false) {
OC_Log::write('core', __METHOD__.'(): Error resampling process image '.$w.'x'.$h, OC_Log::ERROR);