archive/piwigo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
test first git commit
This commit is contained in:
modus75 2015-07-28 22:42:13 +02:00
parent a3538ca9a5
commit 221a3b7e58
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
i.php
View file

@ -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] )