Changeset 13021 for trunk/include/template.class.php

Timestamp:

02/02/12 21:59:41 (16 months ago)

Author:

rvelices

Message:

feature 2548 multisize - custom sizes restricted to those requested by theme/plugin
code refacto

Files:

• trunk/include/template.class.php (modified) (1 diff)

trunk/include/template.class.php

@@ -560 +560 @@
     !empty($params['height']) or fatal_error('define_derviative missing height');
 
-    $derivative = new DerivativeParams( SizingParams::classic( intval($params['width']), intval($params['height'])) );
+    $w = intval($params['width']);
+    $h = intval($params['height']);
+    $crop = 0;
+    $minw=null;
+    $minh=null;
+    
     if (isset($params['crop']))
     {
       if (is_bool($params['crop']))
       {
-        $derivative->sizing->max_crop = $params['crop'] ? 1:0;
+        $crop = $params['crop'] ? 1:0;
       }
       else
       {
-        $derivative->sizing->max_crop = round($params['crop']/100, 2);
-      }
-
-      if ($derivative->sizing->max_crop)
-      {
-        $minw = empty($params['min_width']) ? $derivative->max_width() : intval($params['min_width']);
-        $minw <= $derivative->max_width() or fatal_error('define_derviative invalid min_width');
-        $minh = empty($params['min_height']) ? $derivative->max_height() : intval($params['min_height']);
-        $minh <= $derivative->max_height() or fatal_error('define_derviative invalid min_height');
-
-        $derivative->sizing->min_size = array($minw, $minh);
-      }
-    }
-
-    ImageStdParams::apply_global($derivative);
-    $smarty->assign( $params['name'], $derivative);
+        $crop = round($params['crop']/100, 2);
+      }
+
+      if ($crop)
+      {
+        $minw = empty($params['min_width']) ? $w : intval($params['min_width']);
+        $minw <= $w or fatal_error('define_derviative invalid min_width');
+        $minh = empty($params['min_height']) ? $h : intval($params['min_height']);
+        $minh <= $h or fatal_error('define_derviative invalid min_height');
+      }
+    }
+
+    $smarty->assign( $params['name'], ImageStdParams::get_custom($w, $h, $crop, $minw, $minh) );
   }