DataObjects/Images.php

[Pman.Core] / DataObjects / Images.php

diff --git a/DataObjects/Images.php b/DataObjects/Images.php
index 84b39c0..f550e0e 100644 (file)
--- a/DataObjects/Images.php
+++ b/DataObjects/Images.php
@@ -838,8 +838,33 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
             
             $width = $this->width;
             $height = $this->height;
+
+            if(!empty($scaleWidth)){
+                $width = $scaleWidth;
+
+                if(empty($scaleHeight)){
+                    $height = $this->height * $scaleWidth / $this->width;
+                }
+            }
+
+            if(!empty($scaleHeight)){
+                $height = $scaleHeight;
+
+                if(empty($scaleWidth)){
+                    $width = $this->width * $scaleHeight / $this->height;
+                }
+            }
             
+            $im = imagecreatefromstring($data, IMG_NEAREST_NEIGHBOUR);
             
+            if (($scaled = imagescale($im, $width, $width)) != false) {
+                ob_start();
+                imagejpeg($scaled);
+                $data = ob_get_contents();
+                ob_end_clean();
+                imagedestroy($im);
+                imagedestroy($scaled);
+            }
             
         }