[limb-svn] r6331 - in 3.x/trunk/limb/imagekit/src: . gd gd/filters

[svn at limb-project.com]

Author: pachanga
Date: 2007-09-21 15:23:05 +0400 (Fri, 21 Sep 2007)
New Revision: 6331
URL: http://fisheye.limb-project.com/changelog/limb/?cs=6331

Modified:
   3.x/trunk/limb/imagekit/src/gd/filters/lmbGdResizeImageFilter.class.php
   3.x/trunk/limb/imagekit/src/gd/lmbGdImageConvertor.class.php
   3.x/trunk/limb/imagekit/src/lmbAbstractImageConvertor.class.php
   3.x/trunk/limb/imagekit/src/lmbAbstractImageFilter.class.php
Log:
-- minor code beautifyings

Modified: 3.x/trunk/limb/imagekit/src/gd/filters/lmbGdResizeImageFilter.class.php
===================================================================
--- 3.x/trunk/limb/imagekit/src/gd/filters/lmbGdResizeImageFilter.class.php	2007-09-21 11:03:44 UTC (rev 6330)
+++ 3.x/trunk/limb/imagekit/src/gd/filters/lmbGdResizeImageFilter.class.php	2007-09-21 11:23:05 UTC (rev 6331)
@@ -20,7 +20,6 @@
  */
 class lmbGdResizeImageFilter extends lmbAbstractImageFilter
 {
-
   function run(lmbAbstractImageContainer $container)
   {
     $src_w = $container->getWidth();
@@ -61,4 +60,4 @@
     return $this->getParam('save_min_size', 3, false);
   }
 }
-?>
\ No newline at end of file
+?>

Modified: 3.x/trunk/limb/imagekit/src/gd/lmbGdImageConvertor.class.php
===================================================================
--- 3.x/trunk/limb/imagekit/src/gd/lmbGdImageConvertor.class.php	2007-09-21 11:03:44 UTC (rev 6330)
+++ 3.x/trunk/limb/imagekit/src/gd/lmbGdImageConvertor.class.php	2007-09-21 11:23:05 UTC (rev 6331)
@@ -23,7 +23,6 @@
  */
 class lmbGdImageConvertor extends lmbAbstractImageConvertor 
 {
-
   protected function createFilter($name, $params)
   {
     $class = $this->loadFilter(dirname(__FILE__).'/filters', $name, 'Gd');
@@ -40,12 +39,14 @@
     if(!$src_type) 
     {
       $imginfo = @getimagesize($file);
-      if(!$imginfo) throw new lmbFileNotFoundException($file);
+      if(!$imginfo)
+        throw new lmbFileNotFoundException($file);
       $src_type = lmbGdImageContainer::convertImageType($imginfo[2]);
     }
-    if(!$dest_type) $dest_type = $src_type;
+    if(!$dest_type)
+      $dest_type = $src_type;
     return lmbGdImageContainer::supportLoadType($src_type) &&
            lmbGdImageContainer::supportSaveType($dest_type);
   }
 }
-?>
\ No newline at end of file
+?>

Modified: 3.x/trunk/limb/imagekit/src/lmbAbstractImageConvertor.class.php
===================================================================
--- 3.x/trunk/limb/imagekit/src/lmbAbstractImageConvertor.class.php	2007-09-21 11:03:44 UTC (rev 6330)
+++ 3.x/trunk/limb/imagekit/src/lmbAbstractImageConvertor.class.php	2007-09-21 11:23:05 UTC (rev 6331)
@@ -18,11 +18,6 @@
   protected $filters = array();
   protected $container = null;
 
-  function __construct()
-  {
-
-  }
-
   function addFilter($name, $params)
   {
     $this->filters[] = $this->createFilter($name, $params);
@@ -43,7 +38,8 @@
   function run($src, $dest = null, $src_type = '', $dest_type = '')
   {
     $container = $this->createImageContainer($src, $src_type);
-    foreach($this->filters as $filter) $filter->run($container);
+    foreach($this->filters as $filter)
+      $filter->run($container);
     $container->save($dest, $dest_type);
   }
 
@@ -80,4 +76,4 @@
 
   abstract function isSupportConversion($file, $src_type = '', $dest_type = '');
 }
-?>
\ No newline at end of file
+?>

Modified: 3.x/trunk/limb/imagekit/src/lmbAbstractImageFilter.class.php
===================================================================
--- 3.x/trunk/limb/imagekit/src/lmbAbstractImageFilter.class.php	2007-09-21 11:03:44 UTC (rev 6330)
+++ 3.x/trunk/limb/imagekit/src/lmbAbstractImageFilter.class.php	2007-09-21 11:23:05 UTC (rev 6331)
@@ -48,24 +48,33 @@
       $scale_h = (float)$dst_h / (float)$src_h;
       if($scale_w > 1 && $scale_h > 1)
       {
-        if($save_min_size) $scale = 1;
-        elseif($scale_w > $scale_h) $scale = $scale_h;
-        else $scale = $scale_w;
+        if($save_min_size)
+          $scale = 1;
+        elseif($scale_w > $scale_h)
+          $scale = $scale_h;
+        else
+          $scale = $scale_w;
       }
       elseif($scale_w < 1 && $scale_h < 1)
       {
-        if($scale_w > $scale_h) $scale = $scale_h;
-        else $scale = $scale_w;
+        if($scale_w > $scale_h)
+          $scale = $scale_h;
+        else
+          $scale = $scale_w;
       }
-      elseif($scale_w < 1) $scale = $scale_w;
-      else $scale = $scale_h;
+      elseif($scale_w < 1)
+        $scale = $scale_w;
+      else
+        $scale = $scale_h;
       $w = intval($src_w * $scale);
       $h = intval($src_h * $scale);
     }
     elseif($save_min_size)
     {
-      if($dst_w > $src_w) $w = $src_w;
-      if($dst_h > $src_h) $h = $src_h;
+      if($dst_w > $src_w)
+        $w = $src_w;
+      if($dst_h > $src_h)
+        $h = $src_h;
     }
     return array($w, $h);
   }
@@ -73,11 +82,13 @@
   function getParam($name, $num, $default = null)
   {
   	$param = $default;
-    if(isset($this->params[$name])) $param = $this->params[$name];
-    elseif(isset($this->params[$num])) $param = $this->params[$num];
+    if(isset($this->params[$name]))
+      $param = $this->params[$name];
+    elseif(isset($this->params[$num]))
+      $param = $this->params[$num];
     return $param;
   }
 
   abstract function run(lmbAbstractImageContainer $container);
 }
-?>
\ No newline at end of file
+?>