diff options
| author | rvelices <rv-github@modusoptimus.com> | 2012-07-24 20:50:20 +0000 |
|---|---|---|
| committer | rvelices <rv-github@modusoptimus.com> | 2012-07-24 20:50:20 +0000 |
| commit | 663f6273a714b4fc5468a1d6787d6a529fad1d60 (patch) | |
| tree | b930c976c93fefe51e1cf07a9b58e4b7b30be424 /include/derivative.inc.php | |
| parent | 0bb3361cf1594d620bf82c4ac398a8340419ae1a (diff) | |
bug 2682: Watermark sizing calculation is made on the requested size not on the final one (merge from trunk)
git-svn-id: http://piwigo.org/svn/branches/2.4@16990 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
| -rw-r--r-- | include/derivative.inc.php | 2 |
1 files changed, 1 insertions, 1 deletions
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; |