From: Edward <edward@roojs.com>
Date: Fri, 12 Oct 2018 03:03:52 +0000 (+0800)
Subject: DataObjects/Images.php
X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=commitdiff_plain;h=148d30d83208c08b304a503a60f07862ffc259dd

DataObjects/Images.php
---

diff --git a/DataObjects/Images.php b/DataObjects/Images.php
index 8d9a7ac5..22e4e796 100644
--- a/DataObjects/Images.php
+++ b/DataObjects/Images.php
@@ -866,12 +866,11 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
 //            
 //        }
         
-//        if(!empty($scaleWidth) || !empty($scaleHeight)){
-//            $data = $this->scale($scaleWidth, $scaleHeight);
-//        }
+        if(!empty($scaleWidth) || !empty($scaleHeight)){
+            $data = $this->scale($scaleWidth, $scaleHeight);
+        }
         
         if($rotate){
-            $data = $this->rotate();
             $data = $this->rotate($data);
         }
         
@@ -938,7 +937,7 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
         return $imagick->getImageBlob();
     }
     
-    function scale($width, $height)
+    function scale($width, $height, $imageBlob = false)
     {
         
     }