[Pkg-owncloud-commits] [owncloud] 25/69: Dont create borders around previews when scaling up is disabled

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository owncloud.

commit 578eb33c20e722b47f74ff93c0845dc58bb6864d
Author: Robin Appelman <icewind at owncloud.com>
Date:   Mon May 5 14:54:34 2014 +0200

    Dont create borders around previews when scaling up is disabled
---
 lib/private/preview.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/private/preview.php b/lib/private/preview.php
index 361073a..2964b83 100755
--- a/lib/private/preview.php
+++ b/lib/private/preview.php
@@ -615,7 +615,7 @@ class Preview {
 			return;
 		}
 
-		if ($newXSize < $x || $newYSize < $y) {
+		if (($newXSize < $x || $newYSize < $y) && $scalingUp) {
 			if ($newXSize > $x) {
 				$cropX = floor(($newXSize - $x) * 0.5);
 				$image->crop($cropX, 0, $x, $newYSize);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git