X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FImages.php;h=4c1b928422b2c112d2ef5cd6ecaa5b156d7e43bb;hb=c81b84e5570eb8f4e73c4a7912114e8f32a48b68;hp=036edc707cf6d077af14f54eee9aa7d1fd431434;hpb=4e73ee2760d96fee6b704a27b9cae7810c7cc047;p=Pman.Core

diff --git a/DataObjects/Images.php b/DataObjects/Images.php
index 036edc70..4c1b9284 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,15 +853,22 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
                 }
             }
             
-            $im = imagecreatefromstring($data, IMG_NEAREST_NEIGHBOUR);
+            $im = imagecreatefromstring($data);
             
-            if (($scaled = imagescale($im, $width, $width)) != false) {
-                
+            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($data);
+        }
         
         $base64 = 'data:' . $this->mimetype . ';base64,' . base64_encode($data);
         
@@ -900,12 +905,17 @@ 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(); 
-
+        print_R($orientation);exit;
         switch($orientation) { 
             case Imagick::ORIENTATION_BOTTOMRIGHT: 
                 $imagick->rotateimage(new ImagickPixel('#00000000'), 180); // rotate 180 degrees