From 221a3b7e58e0dde40ed0ff9b8bafa732f98fe9e2 Mon Sep 17 00:00:00 2001
From: modus75 <modus75@users.noreply.github.com>
Date: Tue, 28 Jul 2015 22:42:13 +0200
Subject: 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

---
 i.php | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'i.php')

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] )
-- 
cgit v1.2.3