X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FImages.php;h=451e1f008431dc92c9a7ae42a5a6038da18cc2b0;hb=583c111fd2373700a939a5984e6af254a528f4ed;hp=87f188944a3e9406752c24578f127f686b15b7dd;hpb=2f05e281e57df70ead5aac9084df0dce8b3e3a4c;p=Pman.Core

diff --git a/DataObjects/Images.php b/DataObjects/Images.php
index 87f18894..451e1f00 100644
--- a/DataObjects/Images.php
+++ b/DataObjects/Images.php
@@ -816,7 +816,7 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
         
     }
     
-    function toBase64()
+    function toBase64($rotate = false, $scale = false)
     {
         if(!preg_match('/^image\//', $this->mimetype)){
             return false;
@@ -830,6 +830,10 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
         
         $data = file_get_contents($file);
         
+        if($rotate){
+            $data = $this->rotate();
+        }
+        
         $base64 = 'data:' . $this->mimetype . ';base64,' . base64_encode($data);
         
         return $base64;
@@ -865,10 +869,9 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
         return $page;
     }
     
-    function rotate($blob)
+    function rotate()
     {
-        $imagick = new Imagick();
-        $imagick->readImageBlob($blob);
+        $imagick = new Imagick($this->getStoreName());
         
         $orientation = $imagick->getImageOrientation();