diff options
| author | plegall <plg@piwigo.org> | 2012-07-25 10:32:34 +0000 |
|---|---|---|
| committer | plegall <plg@piwigo.org> | 2012-07-25 10:32:34 +0000 |
| commit | b6329cb062dc3b793931e97eeb2bfd918e2b04e3 (patch) | |
| tree | 159e7e15745746c6c90ec81684ce9063ec28d1ae /admin/include/image.class.php | |
| parent | 60d23d4f611ccca73a3c1efd51933d8097bc59c5 (diff) | |
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
Diffstat (limited to 'admin/include/image.class.php')
| -rw-r--r-- | admin/include/image.class.php | 5 |
1 files changed, 5 insertions, 0 deletions
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; |