X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FImages.php;h=82f3a9a75e010fa7f6d10ce023800d7c5b7ef39f;hb=de203388ca0b5f0c13912316371c527a340ddbb8;hp=1af610b41a73ea9b24eccdd99f94dc61c3e65253;hpb=2331119033ae99a32b3d90e90cfdc1d970d520be;p=Pman.Core

diff --git a/DataObjects/Images.php b/DataObjects/Images.php
index 1af610b4..82f3a9a7 100644
--- a/DataObjects/Images.php
+++ b/DataObjects/Images.php
@@ -830,44 +830,48 @@ class Pman_Core_DataObjects_Images extends DB_DataObject
         
         $data = file_get_contents($file);
         
+//        if(!empty($scaleWidth) || !empty($scaleHeight)){
+//            
+//            $width = $this->width;
+//            $height = $this->height;
+//            
+//            if(!empty($scaleWidth)){
+//                $width = $scaleWidth;
+//
+//                if(empty($scaleHeight)){
+//                    $height = $this->height * $scaleWidth / $this->width;
+//                }
+//            }
+//            
+//            
+//
+//            if(!empty($scaleHeight)){
+//                $height = $scaleHeight;
+//
+//                if(empty($scaleWidth)){
+//                    $width = $this->width * $scaleHeight / $this->height;
+//                }
+//            }
+//            
+//            $im = imagecreatefromstring($data);
+//            
+//            if (($scaled = imagescale($im, $width, $height)) != false) {
+//                ob_start();
+//                imagejpeg($scaled);
+//                $data = ob_get_contents();
+//                ob_end_clean();
+//                imagedestroy($im);
+//                imagedestroy($scaled);
+//            }
+//            
+//        }
+        
         if(!empty($scaleWidth) || !empty($scaleHeight)){
-            
-            $width = $this->width;
-            $height = $this->height;
-            
-            if(!empty($scaleWidth)){
-                $width = $scaleWidth;
-
-                if(empty($scaleHeight)){
-                    $height = $this->height * $scaleWidth / $this->width;
-                }
-            }
-            
-            
-
-            if(!empty($scaleHeight)){
-                $height = $scaleHeight;
-
-                if(empty($scaleWidth)){
-                    $width = $this->width * $scaleHeight / $this->height;
-                }
-            }
-            
-            $im = imagecreatefromstring($data);
-            
-            if (($scaled = imagescale($im, $width, $height)) != false) {
-                ob_start();
-                imagejpeg($scaled);
-                $data = ob_get_contents();
-                ob_end_clean();
-                imagedestroy($im);
-                imagedestroy($scaled);
-            }
-            
+            $data = $this->scale($scaleWidth, $scaleHeight);
         }
         
         if($rotate){
-            $data = $this->rotate();
+            $data = $this->rotate($data);
         }
         
         $base64 = 'data:' . $this->mimetype . ';base64,' . base64_encode($data);
@@ -915,7 +919,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