From 62212c97bd22dd2bee26fe7d6df3917bd1ea3f59 Mon Sep 17 00:00:00 2001
From: rvelices <rv-github@modusoptimus.com>
Date: Wed, 16 Apr 2014 05:15:16 +0000
Subject: 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
---
 admin/include/image.class.php | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'admin/include/image.class.php')

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