Changeset 13038 for trunk/include/derivative_std_params.inc.php

Timestamp:

Feb 6, 2012, 9:59:20 PM (12 years ago)

Author:

rvelices

Message:

multisize - added the coi (still to affine the admin ui + language)
multisize - derivatives can be revuild from a larger derviative instead of the original

File:

• trunk/include/derivative_std_params.inc.php (modified) (4 diffs)

trunk/include/derivative_std_params.inc.php

@@ -73 +73 @@
     return self::$all_type_map[$type];
   }
-  
+
   static function get_custom($w, $h, $crop=0, $minw=null, $minh=null)
   {
@@ -99 +99 @@
     global $conf;
     $arr = @unserialize($conf['derivatives']);
-    if (false!==$arr)
-    {
-      self::$type_map = $arr['d'];
-      self::$watermark = @$arr['w'];
-      if (!self::$watermark) self::$watermark = new WatermarkParams();
-    }
-    else
-    {
-      self::make_default();
-    }
-    self::build_maps();
-  }
-
-  static function load_from_file()
-  {
-    global $conf;
-    $arr = @unserialize(@file_get_contents(PHPWG_ROOT_PATH.$conf['data_location'].'derivatives.dat'));
     if (false!==$arr)
     {
@@ -131 +114 @@
   }
 
+  static function load_from_file()
+  {
+    global $conf;
+    $arr = @unserialize(@file_get_contents(PHPWG_ROOT_PATH.$conf['data_location'].'derivatives.dat'));
+    if (false!==$arr)
+    {
+      self::$type_map = $arr['d'];
+      self::$watermark = @$arr['w'];
+      if (!self::$watermark) self::$watermark = new WatermarkParams();
+      self::$custom = @$arr['c'];
+      if (!self::$custom) self::$custom = array();
+    }
+    else
+    {
+      self::make_default();
+    }
+    self::build_maps();
+  }
+
   static function set_watermark($watermark)
   {
     self::$watermark = $watermark;
   }
-  
+
   static function set_and_save($map)
   {
@@ -177 +179 @@
     }
   }
-  
+
   private static function build_maps()
   {