From b6329cb062dc3b793931e97eeb2bfd918e2b04e3 Mon Sep 17 00:00:00 2001
From: plegall <plg@piwigo.org>
Date: Wed, 25 Jul 2012 10:32:34 +0000
Subject: merge r17003 from branch 2.4 to trunk

bug 2705 (related to): if rotate function is called with a 0 (zero) angle,
like plugin RotateImage may do, ExtIM fails with the same error
"convert: invalid argument for option `-rotate': -orient"



git-svn-id: http://piwigo.org/svn/trunk@17004 68402e56-0260-453c-a942-63ccdbb3a9ee
---
 admin/include/image.class.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/admin/include/image.class.php b/admin/include/image.class.php
index 499fcbbea..410a2dd05 100644
--- a/admin/include/image.class.php
+++ b/admin/include/image.class.php
@@ -559,6 +559,11 @@ class image_ext_imagick implements imageInterface
 
   function rotate($rotation)
   {
+    if (empty($rotation))
+    {
+      return true;
+    }
+
     if ($rotation==90 || $rotation==270)
     {
       $tmp = $this->width;
-- 
cgit v1.2.3