Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
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
  • Loading branch information
plegall committed Jul 25, 2012
1 parent 60d23d4 commit b6329cb
Showing 1 changed file with 5 additions and 0 deletions.
5 changes: 5 additions & 0 deletions admin/include/image.class.php
Expand Up @@ -559,6 +559,11 @@ function strip()

function rotate($rotation)
{
if (empty($rotation))
{
return true;
}

if ($rotation==90 || $rotation==270)
{
$tmp = $this->width;
Expand Down

0 comments on commit b6329cb

Please sign in to comment.