X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FImages.php;h=4c1b928422b2c112d2ef5cd6ecaa5b156d7e43bb;hb=c81b84e5570eb8f4e73c4a7912114e8f32a48b68;hp=e26ff0bcccff73b69e2b46fb2c8898660ee9b487;hpb=193c4035a87ef8eff8f50bd222f4c5a0f34c1a93;p=Pman.Core

diff --git a/DataObjects/Images.php b/DataObjects/Images.php
index e26ff0bc..4c1b9284 100644
--- a/DataObjects/Images.php
+++ b/DataObjects/Images.php
@@ -830,10 +830,6 @@ 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;
@@ -870,6 +866,10 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
             
         }
         
+        if($rotate){
+            $data = $this->rotate($data);
+        }
+        
         $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;
+        print_R($orientation);exit;
         switch($orientation) { 
             case Imagick::ORIENTATION_BOTTOMRIGHT: 
                 $imagick->rotateimage(new ImagickPixel('#00000000'), 180); // rotate 180 degrees