Merge remote-tracking branch 'origin/doubled_code_for_scaling-dimensions' into double...

# Conflicts:
#	src/Object/Image.php

diff --cc src/Object/Image.php
index 67a1af3d1ec47b374f7c9fa49f1301468bcae380,a6436a950c1480590b9bbedc7f444343e3659a3a..62bc8d897f606be22da30cd7536d268bb2cb5736
--- 1/src/Object/Image.php
--- 2/src/Object/Image.php
+++ b/src/Object/Image.php
@@@ -285,10 -285,7 +285,10 @@@ class Imag
                $width = $this->getWidth();
                $height = $this->getHeight();
  
-               $scale = Images::getScalingDimensions($width, $height,$max);
 -              if ((! $width)|| (! $height)) {
++              $scale = Images::getScalingDimensions($width, $height, $max);
 +              if ($scale) {
 +                      return $this->scale($scale['width'], $scale['height']);
 +              } else {
                        return false;
                }