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

diff --git a/DataObjects/Images.php b/DataObjects/Images.php
index 87f18894..1af610b4 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,46 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
         
         $data = file_get_contents($file);
         
+        if(!empty($scaleWidth) || !empty($scaleHeight)){
+            
+            $width = $this->width;
+            $height = $this->height;
+            
+            if(!empty($scaleWidth)){
+                $width = $scaleWidth;
+
+                if(empty($scaleHeight)){
+                    $height = $this->height * $scaleWidth / $this->width;
+                }
+            }
+            
+            
+
+            if(!empty($scaleHeight)){
+                $height = $scaleHeight;
+
+                if(empty($scaleWidth)){
+                    $width = $this->width * $scaleHeight / $this->height;
+                }
+            }
+            
+            $im = imagecreatefromstring($data);
+            
+            if (($scaled = imagescale($im, $width, $height)) != false) {
+                ob_start();
+                imagejpeg($scaled);
+                $data = ob_get_contents();
+                ob_end_clean();
+                imagedestroy($im);
+                imagedestroy($scaled);
+            }
+            
+        }
+        
+        if($rotate){
+            $data = $this->rotate();
+        }
+        
         $base64 = 'data:' . $this->mimetype . ';base64,' . base64_encode($data);
         
         return $base64;
@@ -865,10 +905,14 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
         return $page;
     }
     
-    function rotate($blob)
+    function rotate($imageBlob = false)
     {
-        $imagick = new Imagick();
-        $imagick->readImageBlob($blob);
+        if(empty($imageBlob)){
+            $imagick = new Imagick($this->getStoreName());
+        } else {
+            $imagick = new Imagick();
+            $imagick->readImageBlob($imageBlob);
+        }
         
         $orientation = $imagick->getImageOrientation();