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

DataObjects/Images.php
---

diff --git a/DataObjects/Images.php b/DataObjects/Images.php
index 1af610b4..96b7c880 100644
--- a/DataObjects/Images.php
+++ b/DataObjects/Images.php
@@ -830,6 +830,10 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
         
         $data = file_get_contents($file);
         
+        if($rotate){
+            $data = $this->rotate();
+        }
+        
         if(!empty($scaleWidth) || !empty($scaleHeight)){
             
             $width = $this->width;
@@ -866,10 +870,6 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
             
         }
         
-        if($rotate){
-            $data = $this->rotate();
-        }
-        
         $base64 = 'data:' . $this->mimetype . ';base64,' . base64_encode($data);
         
         return $base64;
@@ -915,7 +915,7 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
         }
         
         $orientation = $imagick->getImageOrientation(); 
-
+        print_R($orientation);exit;
         switch($orientation) { 
             case Imagick::ORIENTATION_BOTTOMRIGHT: 
                 $imagick->rotateimage(new ImagickPixel('#00000000'), 180); // rotate 180 degrees