X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FImages.php;h=d024fcfb1ced3c08d28c94f0ea18c970c7294189;hb=a3aee94f26d113c118d2fc75eea8a75fa99d8098;hp=aafd08eed15298bcc865d5fdedb3b7cc46798cc6;hpb=fe26ec66e6cdbb46ddee9ecdd9e9b692ba7491f8;p=Pman.Core

diff --git a/DataObjects/Images.php b/DataObjects/Images.php
index aafd08ee..d024fcfb 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,14 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
         
         $data = file_get_contents($file);
         
+        if(!empty($scaleWidth) || !empty($scaleHeight)){
+            $data = $this->scale(false, $scaleWidth, $scaleHeight);
+        }
+        
+        if($rotate){
+            $data = $this->rotate($data);
+        }
+        
         $base64 = 'data:' . $this->mimetype . ';base64,' . base64_encode($data);
         
         return $base64;
@@ -865,22 +873,17 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
         return $page;
     }
     
-    function rotate($blob = false)
+    function rotate($imageBlob = false)
     {
-        if(empty($this->id) && !$blob){
-            return false;
-        }
-        
-        $imagick = new Imagick();
-        
-        if(!empty($this->id)){
-            $imagick->readimage($this->getStoreName());
+        if(empty($imageBlob)){
+            $imagick = new Imagick($this->getStoreName());
         } else {
-            $imagick->readImageBlob($blob);
+            $imagick = new Imagick();
+            $imagick->readImageBlob($imageBlob);
         }
         
         $orientation = $imagick->getImageOrientation(); 
-
+        
         switch($orientation) { 
             case Imagick::ORIENTATION_BOTTOMRIGHT: 
                 $imagick->rotateimage(new ImagickPixel('#00000000'), 180); // rotate 180 degrees 
@@ -898,4 +901,19 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
         return $imagick->getImageBlob();
     }
     
+    function scale($imageBlob = false, $width = 0, $height = 0)
+    {
+        if(empty($imageBlob)){
+            $imagick = new Imagick($this->getStoreName());
+        } else {
+            $imagick = new Imagick();
+            $imagick->readImageBlob($imageBlob);
+        }
+        
+        $imagick->resizeimage($width, $height, Imagick::FILTER_LANCZOS, true, true);
+        
+        return $imagick->getImageBlob();
+        
+    }
+    
  }