X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FImages.php;h=03d9713ecf093bdcf753f9125b3d9667fdd90140;hb=14c83a50c1c5fe4415f866768893a3735daa2d74;hp=84b39c02a1995251c6fd3040c4771b214697ce28;hpb=ec66c819ea337d79e1cfd39d780741a40ca0a264;p=Pman.Core

diff --git a/DataObjects/Images.php b/DataObjects/Images.php
index 84b39c02..03d9713e 100644
--- a/DataObjects/Images.php
+++ b/DataObjects/Images.php
@@ -830,17 +830,44 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
         
         $data = file_get_contents($file);
         
-        if($rotate){
-            $data = $this->rotate();
-        }
-        
         if(!empty($scaleWidth) || !empty($scaleHeight)){
             
             $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);
+            
+            if (($scaled = imagescale($im, $width, $height)) != false) {
+                ob_start();
+                imagejpeg($scaled);
+                $data = ob_get_contents();
+                ob_end_clean();
+                imagedestroy($im);
+                imagedestroy($scaled);
+            }
+            
+        }
+        
+        if($rotate){
+            $data = $this->rotate();
         }
         
         $base64 = 'data:' . $this->mimetype . ';base64,' . base64_encode($data);