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

diff --git a/DataObjects/Images.php b/DataObjects/Images.php
index 1c0d86a9..1af610b4 100644
--- a/DataObjects/Images.php
+++ b/DataObjects/Images.php
@@ -830,15 +830,11 @@ 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;
 
@@ -846,6 +842,8 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
                     $height = $this->height * $scaleWidth / $this->width;
                 }
             }
+            
+            
 
             if(!empty($scaleHeight)){
                 $height = $scaleHeight;
@@ -855,11 +853,22 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
                 }
             }
             
+            $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);
         
@@ -896,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();