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

diff --git a/DataObjects/Images.php b/DataObjects/Images.php
index 03d9713e..4c1b9284 100644
--- a/DataObjects/Images.php
+++ b/DataObjects/Images.php
@@ -867,7 +867,7 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
         }
         
         if($rotate){
-            $data = $this->rotate();
+            $data = $this->rotate($data);
         }
         
         $base64 = 'data:' . $this->mimetype . ';base64,' . base64_encode($data);
@@ -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