diff options
| author | kondou <kondou@ts.unde.re> | 2013-08-31 23:48:23 +0200 |
|---|---|---|
| committer | kondou <kondou@ts.unde.re> | 2013-08-31 23:48:23 +0200 |
| commit | 235638e5abd35f2f19944bbe0b5a838b83465252 (patch) | |
| tree | 27b531a7f9a2de054e707d4415ce7de2a2c51556 /lib/image.php | |
| parent | 0869f9b655ddd0b285629256521d7eafde2f5d8a (diff) | |
| parent | 92e90c8eb995c886b3e9cd77c14e3f0b25b95cd7 (diff) | |
| download | nextcloud-server-235638e5abd35f2f19944bbe0b5a838b83465252.tar.gz nextcloud-server-235638e5abd35f2f19944bbe0b5a838b83465252.zip | |
Merge branch 'master' into fix_4258
Conflicts:
lib/image.php
Diffstat (limited to 'lib/image.php')
| -rw-r--r-- | lib/image.php | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/image.php b/lib/image.php index fcb13a1fa14..badc30ab9a0 100644 --- a/lib/image.php +++ b/lib/image.php @@ -522,6 +522,11 @@ class OC_Image { if (\OC_Util::fileInfoLoaded()) { $this->mimeType = $this->fileInfo->buffer($str); } + if(is_resource($this->resource)) { + imagealphablending($this->resource, false); + imagesavealpha($this->resource, true); + } + if(!$this->resource) { OC_Log::write('core', 'OC_Image->loadFromData, couldn\'t load', OC_Log::DEBUG); return false; |