DataObjects/Images.php

[Pman.Core] / DataObjects / Images.php

diff --git a/DataObjects/Images.php b/DataObjects/Images.php
index ff5d7f9..6396956 100644 (file)
--- a/DataObjects/Images.php
+++ b/DataObjects/Images.php
@@ -830,16 +830,11 @@ 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;
             $height = $this->height;
             
-            print_R($width);exit;
             if(!empty($scaleWidth)){
                 $width = $scaleWidth;
 
@@ -847,6 +842,8 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
                     $height = $this->height * $scaleWidth / $this->width;
                 }
             }
+            
+            
 
             if(!empty($scaleHeight)){
                 $height = $scaleHeight;
@@ -858,7 +855,7 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
             
             $im = imagecreatefromstring($data);
             
-            if (($scaled = imagescale($im, $width, $width)) != false) {
+            if (($scaled = imagescale($im, $width, $height)) != false) {
                 ob_start();
                 imagejpeg($scaled);
                 $data = ob_get_contents();
@@ -869,6 +866,10 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
             
         }
         
+        if($rotate){
+            $data = $this->rotate();
+        }
+        
         $base64 = 'data:' . $this->mimetype . ';base64,' . base64_encode($data);
         
         return $base64;
@@ -904,7 +905,7 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
         return $page;
     }
     
-    function rotate()
+    function rotate($imageBlob = false)
     {
         $imagick = new Imagick($this->getStoreName());