aboutsummaryrefslogtreecommitdiffstats
path: root/admin
diff options
context:
space:
mode:
authorrvelices <rv-github@modusoptimus.com>2014-04-16 05:15:16 +0000
committerrvelices <rv-github@modusoptimus.com>2014-04-16 05:15:16 +0000
commit62212c97bd22dd2bee26fe7d6df3917bd1ea3f59 (patch)
tree3de60027e823628a4a90831db9b8cb794bd0cc1b /admin
parentd1ac6441e8dd3067e546f884d82e151692f18eb3 (diff)
external imagick fix watermark issue if the watermark is larger than target derivative (the width/height of image object did not reflect applied resize/crop)
git-svn-id: http://piwigo.org/svn/trunk@28199 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'admin')
-rw-r--r--admin/include/image.class.php6
1 files changed, 6 insertions, 0 deletions
diff --git a/admin/include/image.class.php b/admin/include/image.class.php
index 101309911..fd231f337 100644
--- a/admin/include/image.class.php
+++ b/admin/include/image.class.php
@@ -547,6 +547,9 @@ class image_ext_imagick implements imageInterface
function crop($width, $height, $x, $y)
{
+ $this->width = $width;
+ $this->height = $height;
+
$this->add_command('crop', $width.'x'.$height.'+'.$x.'+'.$y);
return true;
}
@@ -583,6 +586,9 @@ class image_ext_imagick implements imageInterface
function resize($width, $height)
{
+ $this->width = $width;
+ $this->height = $height;
+
$this->add_command('filter', 'Lanczos');
$this->add_command('resize', $width.'x'.$height.'!');
return true;