summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2014-09-16 08:33:56 +0200
committerMorris Jobke <hey@morrisjobke.de>2014-09-16 08:33:56 +0200
commit245a0e2ad8256b20cf4edaedaa0c1df53b662293 (patch)
treea8d37b2aac2043abf7e16cc2885b179446a06cff /tests
parent1e6ac31bdecf90c60688483795e0202bb84b8413 (diff)
parent18ef7bf1edbb2046e473765cbc25eae3299590e9 (diff)
downloadnextcloud-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 'tests')
-rw-r--r--tests/lib/image.php3
1 files changed, 3 insertions, 0 deletions
diff --git a/tests/lib/image.php b/tests/lib/image.php
index 131a9d86f3e..795bc464159 100644
--- a/tests/lib/image.php
+++ b/tests/lib/image.php
@@ -115,6 +115,9 @@ class Test_Image extends PHPUnit_Framework_TestCase {
public function testData() {
$img = new \OC_Image(OC::$SERVERROOT.'/tests/data/testimage.png');
$raw = imagecreatefromstring(file_get_contents(OC::$SERVERROOT.'/tests/data/testimage.png'));
+ // Preserve transparency
+ imagealphablending($raw, true);
+ imagesavealpha($raw, true);
ob_start();
imagepng($raw);
$expected = ob_get_clean();