aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormodus75 <modus75@users.noreply.github.com>2015-07-28 22:42:13 +0200
committermodus75 <modus75@users.noreply.github.com>2015-07-28 22:42:13 +0200
commit221a3b7e58e0dde40ed0ff9b8bafa732f98fe9e2 (patch)
tree1147a5b4689aab94d1cd48c0e9b76063db532c5b
parenta3538ca9a5c728e62e43a2f1fa00f64de466cae6 (diff)
fix issue #328 a square that requires watermark should not be generated from a larger derivative with watermark, because if the watermark is not centered on the large image, it will be cropped
test first git commit
-rw-r--r--i.php2
1 files changed, 2 insertions, 0 deletions
diff --git a/i.php b/i.php
index c9a807aac..0f242cf2d 100644
--- a/i.php
+++ b/i.php
@@ -313,6 +313,8 @@ function try_switch_source(DerivativeParams $params, $original_mtime)
}
else
{
+ if ($use_watermark && $candidate->use_watermark)
+ continue; //a square that requires watermark should not be generated from a larger derivative with watermark, because if the watermark is not centered on the large image, it will be cropped.
if ($candidate->sizing->max_crop!=0)
continue; // this could be optimized
if ($candidate_size[0] < $params->sizing->min_size[0] || $candidate_size[1] < $params->sizing->min_size[1] )