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_params.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 'include/derivative_params.inc.php')
| -rw-r--r-- | include/derivative_params.inc.php | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/include/derivative_params.inc.php b/include/derivative_params.inc.php index 3128e5fb2..b29255c53 100644 --- a/include/derivative_params.inc.php +++ b/include/derivative_params.inc.php @@ -281,5 +281,16 @@ final class DerivativeParams } return true; } + + function will_watermark($out_size) + { + if ($this->use_watermark) + { + $min_size = ImageStdParams::get_watermark()->min_size; + return $min_size[0]<=$out_size[0] + && $min_size[1]<=$$out_size[1]; + } + return false; + } } ?>
\ No newline at end of file |