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
This commit is contained in:
rvelices
2012-07-24 20:54:08 +00:00
parent 7502b3bbee
commit 0de9ecfb4a

View File

@@ -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;
}