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

DataObjects/Images.php
---

diff --git a/DataObjects/Images.php b/DataObjects/Images.php
index 5884eabc..1c0d86a9 100644
--- a/DataObjects/Images.php
+++ b/DataObjects/Images.php
@@ -833,24 +833,30 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
         if($rotate){
             $data = $this->rotate();
         }
+        
+        if(!empty($scaleWidth) || !empty($scaleHeight)){
             
-        $width = $this->width;
-        $height = $this->height;
+            $width = $this->width;
+            $height = $this->height;
 
-        if(!empty($scaleWidth)){
-            $width = $scaleWidth;
+            if(!empty($scaleWidth)){
+                $width = $scaleWidth;
 
-            if(empty($scaleHeight)){
-                $height = $this->height * $scaleWidth / $this->width;
+                if(empty($scaleHeight)){
+                    $height = $this->height * $scaleWidth / $this->width;
+                }
             }
-        }
-        
-        if(!empty($scaleHeight)){
-            $height = $scaleHeight;
 
-            if(empty($scaleWidth)){
-                $width = $this->width * $scaleHeight / $this->height;
+            if(!empty($scaleHeight)){
+                $height = $scaleHeight;
+
+                if(empty($scaleWidth)){
+                    $width = $this->width * $scaleHeight / $this->height;
+                }
             }
+            
+            
+            
         }