DataObjects/Images.php

[Pman.Core] / DataObjects / Images.php

diff --git a/DataObjects/Images.php b/DataObjects/Images.php
index 03d9713..5576072 100644 (file)
--- a/DataObjects/Images.php
+++ b/DataObjects/Images.php
@@ -866,9 +866,9 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
             
         }
         
-        if($rotate){
-            $data = $this->rotate();
-        }
+//        if($rotate){
+//            $data = $this->rotate($data);
+//        }
         
         $base64 = 'data:' . $this->mimetype . ';base64,' . base64_encode($data);
         
@@ -905,9 +905,14 @@ 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();