DataObjects/Images.php

[Pman.Core] / DataObjects / Images.php

diff --git a/DataObjects/Images.php b/DataObjects/Images.php
index aafd08e..d90463d 100644 (file)
--- 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)
     {
         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,19 +869,9 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
         return $page;
     }
     
-    function rotate($blob = false)
+    function rotate()
     {
-        if(empty($this->id) && !$blob){
-            return false;
-        }
-        
-        $imagick = new Imagick();
-        
-        if(!empty($this->id)){
-            $imagick->readimage($this->getStoreName());
-        } else {
-            $imagick->readImageBlob($blob);
-        }
+        $imagick = new Imagick($this->getStoreName());
         
         $orientation = $imagick->getImageOrientation();