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

diff --git a/DataObjects/Images.php b/DataObjects/Images.php
index ff1f107d..4c1b9284 100644
--- a/DataObjects/Images.php
+++ b/DataObjects/Images.php
@@ -830,10 +830,6 @@ 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;
@@ -847,7 +843,7 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
                 }
             }
             
-            print_R($width);exit;
+            
 
             if(!empty($scaleHeight)){
                 $height = $scaleHeight;
@@ -859,7 +855,7 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
             
             $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();
@@ -870,6 +866,10 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
             
         }
         
+        if($rotate){
+            $data = $this->rotate($data);
+        }
+        
         $base64 = 'data:' . $this->mimetype . ';base64,' . base64_encode($data);
         
         return $base64;
@@ -905,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