From 7502b3bbee558399d1850e1cbdb09ef60fd073de Mon Sep 17 00:00:00 2001 From: rvelices Date: Tue, 24 Jul 2012 20:49:31 +0000 Subject: bug 2682: Watermark sizing calculation is made on the requested size not on the final one git-svn-id: http://piwigo.org/svn/trunk@16989 68402e56-0260-453c-a942-63ccdbb3a9ee --- include/derivative.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/derivative.inc.php') diff --git a/include/derivative.inc.php b/include/derivative.inc.php index d19b5a1b8..b89e39e3b 100644 --- a/include/derivative.inc.php +++ b/include/derivative.inc.php @@ -197,7 +197,7 @@ final class DerivativeImage { if ( $src->has_size() && $params->is_identity( $src->get_size() ) ) { - if (!$params->use_watermark && !$src->rotation) + if (!$params->will_watermark($src->get_size()) && !$src->rotation) { $params = null; $rel_path = $rel_url = $src->rel_path; -- cgit v1.2.3