diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2013-08-31 03:41:29 -0700 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2013-08-31 03:41:29 -0700 |
| commit | 92e90c8eb995c886b3e9cd77c14e3f0b25b95cd7 (patch) | |
| tree | ed757086fcf6d761a615eb7bbbf24ebc06407310 /lib/image.php | |
| parent | 0f5df181a3b1f88075193fca0bed88f289314c8e (diff) | |
| parent | 668c4c2652ef4619a132d609461423aafaef424e (diff) | |
| download | nextcloud-server-92e90c8eb995c886b3e9cd77c14e3f0b25b95cd7.tar.gz nextcloud-server-92e90c8eb995c886b3e9cd77c14e3f0b25b95cd7.zip | |
Merge pull request #4022 from owncloud/oc_preview
\OC\Preview
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 4bc38e20e56..840b744ad72 100644 --- a/lib/image.php +++ b/lib/image.php @@ -496,6 +496,11 @@ class OC_Image { return false; } $this->resource = @imagecreatefromstring($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; |