diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2014-09-16 08:33:56 +0200 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2014-09-16 08:33:56 +0200 |
| commit | 245a0e2ad8256b20cf4edaedaa0c1df53b662293 (patch) | |
| tree | a8d37b2aac2043abf7e16cc2885b179446a06cff /lib/private | |
| parent | 1e6ac31bdecf90c60688483795e0202bb84b8413 (diff) | |
| parent | 18ef7bf1edbb2046e473765cbc25eae3299590e9 (diff) | |
| download | nextcloud-server-245a0e2ad8256b20cf4edaedaa0c1df53b662293.tar.gz nextcloud-server-245a0e2ad8256b20cf4edaedaa0c1df53b662293.zip | |
Merge pull request #10362 from owncloud/preserve_transparency_on_fileload
Preserve transparency when loading from a file
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 7ddc8dca143..bab91745c05 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, |