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

diff --git a/DataObjects/Images.php b/DataObjects/Images.php
index 87f18894..d5728f3b 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, $scaleWidth = 0, $scaleHeight = 0)
     {
         if(!preg_match('/^image\//', $this->mimetype)){
             return false;
@@ -830,6 +830,12 @@ 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 +871,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();