diff options
| author | kondou <kondou@ts.unde.re> | 2014-08-12 11:00:00 +0200 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2014-09-16 08:34:18 +0200 |
| commit | 86400ea4c89d7141b6122a5a0fda3b6a16987ccc (patch) | |
| tree | 5dcd449348fc10719cfd6b056bd222f59b39506a /lib/private | |
| parent | ff6deb809a7953a1e0b2199d63fb1a131565a607 (diff) | |
| download | nextcloud-server-86400ea4c89d7141b6122a5a0fda3b6a16987ccc.tar.gz nextcloud-server-86400ea4c89d7141b6122a5a0fda3b6a16987ccc.zip | |
Preserve transparency when loading from a file
Fix #7148 - again :)
Diffstat (limited to 'lib/private')
| -rw-r--r-- | lib/private/image.php | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/lib/private/image.php b/lib/private/image.php index 0dff8c5a9da..c055c693f62 100644 --- a/lib/private/image.php +++ b/lib/private/image.php @@ -450,6 +450,9 @@ class OC_Image { case IMAGETYPE_GIF: if (imagetypes() & IMG_GIF) { $this->resource = imagecreatefromgif($imagePath); + // Preserve transparency + imagealphablending($this->resource, true); + imagesavealpha($this->resource, true); } else { OC_Log::write('core', 'OC_Image->loadFromFile, GIF images not supported: '.$imagePath, @@ -468,6 +471,9 @@ class OC_Image { case IMAGETYPE_PNG: if (imagetypes() & IMG_PNG) { $this->resource = imagecreatefrompng($imagePath); + // Preserve transparency + imagealphablending($this->resource, true); + imagesavealpha($this->resource, true); } else { OC_Log::write('core', 'OC_Image->loadFromFile, PNG images not supported: '.$imagePath, |