From 1c948a7fd5e49f002ae72839067b1a58fdb38566 Mon Sep 17 00:00:00 2001 From: rvelices Date: Tue, 24 Jul 2012 20:54:52 +0000 Subject: bug 2682: Watermark sizing calculation is made on the requested size not on the final one - fix (merge from trunk) git-svn-id: http://piwigo.org/svn/branches/2.4@16992 68402e56-0260-453c-a942-63ccdbb3a9ee --- include/derivative_params.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/derivative_params.inc.php b/include/derivative_params.inc.php index b29255c53..82b197ee9 100644 --- a/include/derivative_params.inc.php +++ b/include/derivative_params.inc.php @@ -288,7 +288,7 @@ final class DerivativeParams { $min_size = ImageStdParams::get_watermark()->min_size; return $min_size[0]<=$out_size[0] - && $min_size[1]<=$$out_size[1]; + || $min_size[1]<=$$out_size[1]; } return false; } -- cgit v1.2.3