diff options
| author | rvelices <rv-github@modusoptimus.com> | 2012-07-24 20:54:08 +0000 |
|---|---|---|
| committer | rvelices <rv-github@modusoptimus.com> | 2012-07-24 20:54:08 +0000 |
| commit | 0de9ecfb4abaef2f3f0285264436ffeb1686e6c2 (patch) | |
| tree | a6cc132aca6b94e18d951d48cb8bb07484e902f9 /include | |
| parent | 7502b3bbee558399d1850e1cbdb09ef60fd073de (diff) | |
bug 2682: Watermark sizing calculation is made on the requested size not on the final one - fix
git-svn-id: http://piwigo.org/svn/trunk@16991 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'include')
| -rw-r--r-- | include/derivative_params.inc.php | 2 |
1 files changed, 1 insertions, 1 deletions
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; } |