X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FImages.php;h=1af610b41a73ea9b24eccdd99f94dc61c3e65253;hb=2ec5e4f31b14f1f67b32c28266c4f08ff7a5bd44;hp=8d6d68bc38ec4899579edc11bc52520a2bb0efd6;hpb=eeb8e2599bd1a3204b0b7bcf69ad23ca801ceef8;p=Pman.Core

diff --git a/DataObjects/Images.php b/DataObjects/Images.php
index 8d6d68bc..1af610b4 100644
--- a/DataObjects/Images.php
+++ b/DataObjects/Images.php
@@ -830,6 +830,42 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
         
         $data = file_get_contents($file);
         
+        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();
         }
@@ -869,9 +905,14 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
         return $page;
     }
     
-    function rotate()
+    function rotate($imageBlob = false)
     {
-        $imagick = new Imagick($this->getStoreName());
+        if(empty($imageBlob)){
+            $imagick = new Imagick($this->getStoreName());
+        } else {
+            $imagick = new Imagick();
+            $imagick->readImageBlob($imageBlob);
+        }
         
         $orientation = $imagick->getImageOrientation();