From 8dba46912d19bf976b24e0c097368f2e56ccb97b Mon Sep 17 00:00:00 2001
From: Georg Ehrke <georg@ownCloud.com>
Date: Fri, 17 May 2013 11:28:49 +0200
Subject: [PATCH] Disable transparent backgrounds for now
---
lib/preview.php | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/lib/preview.php b/lib/preview.php
index c062a06887..44b551006f 100755
--- a/lib/preview.php
+++ b/lib/preview.php
@@ -427,17 +427,21 @@ class OC_Preview {
$newYsize = (int) $image->height();
//create transparent background layer
- $transparentlayer = imagecreatetruecolor($x, $y);
- $black = imagecolorallocate($transparentlayer, 0, 0, 0);
+ $backgroundlayer = imagecreatetruecolor($x, $y);
+ $white = imagecolorallocate($backgroundlayer, 255, 255, 255);
+ imagefill($backgroundlayer, 0, 0, $white);
+
$image = $image->resource();
- imagecolortransparent($transparentlayer, $black);
$mergeX = floor(abs($x - $newXsize) * 0.5);
$mergeY = floor(abs($y - $newYsize) * 0.5);
- imagecopymerge($transparentlayer, $image, $mergeX, $mergeY, 0, 0, $newXsize, $newYsize, 100);
+ imagecopy($backgroundlayer, $image, $mergeX, $mergeY, 0, 0, $newXsize, $newYsize);
+
+ //$black = imagecolorallocate(0,0,0);
+ //imagecolortransparent($transparentlayer, $black);
- $image = new \OC_Image($transparentlayer);
+ $image = new \OC_Image($backgroundlayer);
$this->preview = $image;
return;
--
GitLab