DataObjects/Images.php

[Pman.Core] / DataObjects / Images.php

diff --git a/DataObjects/Images.php b/DataObjects/Images.php
index ff1f107..96b7c88 100644 (file)
--- a/DataObjects/Images.php
+++ b/DataObjects/Images.php
@@ -847,7 +847,7 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
                 }
             }
             
-            print_R($width);exit;
+            
 
             if(!empty($scaleHeight)){
                 $height = $scaleHeight;
@@ -859,7 +859,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();
@@ -905,12 +905,17 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
         return $page;
     }
     
-    function rotate()
+    function rotate($imageBlob = false)
     {
-        $imagick = new Imagick($this->getStoreName());
+        if(empty($imageBlob)){
+            $imagick = new Imagick($this->getStoreName());
+        } else {
+            $imagick = new Imagick();
+            $imagick->readImageBlob($imageBlob);
+        }
         
         $orientation = $imagick->getImageOrientation(); 
-
+        print_R($orientation);exit;
         switch($orientation) { 
             case Imagick::ORIENTATION_BOTTOMRIGHT: 
                 $imagick->rotateimage(new ImagickPixel('#00000000'), 180); // rotate 180 degrees