Slightly refactor enlarging logic, and add enlarging option to the rest of the size manipulation methods

Author: Mitch

src/ImageResize.php

@@ -156,22 +156,22 @@ public function output($image_type = null, $quality = null)
         $this->save(null, $image_type, $quality);
     }
 
-    public function resizeToHeight($height)
+    public function resizeToHeight($height, $allow_enlarge = false)
     {
         $ratio = $height / $this->getSourceHeight();
         $width = $this->getSourceWidth() * $ratio;
 
-        $this->resize($width, $height);
+        $this->resize($width, $height, $allow_enlarge);
 
         return $this;
     }
 
-    public function resizeToWidth($width)
+    public function resizeToWidth($width, $allow_enlarge = false)
     {
         $ratio  = $width / $this->getSourceWidth();
         $height = $this->getSourceHeight() * $ratio;
 
-        $this->resize($width, $height);
+        $this->resize($width, $height, $allow_enlarge);
 
         return $this;
     }
@@ -189,6 +189,10 @@ public function scale($scale)
     public function resize($width, $height, $allow_enlarge = false)
     {
         if (!$allow_enlarge) {
+            // if the user hasn't explicitly allowed enlarging,
+            // but either of the dimensions are larger then the original,
+            // then just use original dimensions - this logic may need rethinking
+
             if ($width > $this->getSourceWidth() || $height > $this->getSourceHeight()) {
                 $width  = $this->getSourceWidth();
                 $height = $this->getSourceHeight();
@@ -210,8 +214,15 @@ public function resize($width, $height, $allow_enlarge = false)
     public function crop($width, $height, $allow_enlarge = false)
     {
         if (!$allow_enlarge) {
-            if ($width > $this->getSourceWidth() || $height > $this->getSourceHeight()) {
+            // this logic is slightly different to resize(),
+            // it will only reset dimensions to the original
+            // if that particular dimenstion is larger
+
+            if ($width > $this->getSourceWidth()) {
                 $width  = $this->getSourceWidth();
+            }
+
+            if ($height > $this->getSourceHeight()) {
                 $height = $this->getSourceHeight();
             }
         }
@@ -220,7 +231,7 @@ public function crop($width, $height, $allow_enlarge = false)
         $ratio_dest = $width / $height;
 
         if ($ratio_dest < $ratio_source) {
-            $this->resizeToHeight($height);
+            $this->resizeToHeight($height, $allow_enlarge);
 
             $excess_width = ($this->getDestWidth() - $width) / $this->getDestWidth() * $this->getSourceWidth();
 
@@ -229,7 +240,7 @@ public function crop($width, $height, $allow_enlarge = false)
 
             $this->dest_w = $width;
         } else {
-            $this->resizeToWidth($width);
+            $this->resizeToWidth($width, $allow_enlarge);
 
             $excess_height = ($this->getDestHeight() - $height) / $this->getDestHeight() * $this->getSourceHeight();