Changeset 13038 for trunk/include

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

Location:

trunk/include

Files:

• dblayer/functions_mysql.inc.php (modified) (2 diffs)
• derivative.inc.php (modified) (5 diffs)
• derivative_params.inc.php (modified) (2 diffs)
• derivative_std_params.inc.php (modified) (4 diffs)

trunk/include/dblayer/functions_mysql.inc.php

@@ -85 +85 @@
   global $conf,$page,$debug,$t2;
 
-  $start = get_moment();
+  $start = microtime(true);
   ($result = mysql_query($query)) or my_error($query, $conf['die_on_sql_error']);
 
-  $time = get_moment() - $start;
+  $time = microtime(true) - $start;
 
   if (!isset($page['count_queries']))
@@ -200 +200 @@
   while ($row = mysql_fetch_assoc($result))
   {
-    array_push($array, $row[$fieldname]);
+    $array[] = $row[$fieldname];
   }
 

trunk/include/derivative.inc.php

@@ -28 +28 @@
   public $rel_path;
 
-  public $coi=null;
   private $size=null;
   private $flags=0;
@@ -35 +34 @@
   {
     global $conf;
-    
+
     $this->id = $infos['id'];
     $ext = get_extension($infos['path']);
@@ -55 +54 @@
     }
 
-    $this->coi = @$infos['coi'];
     if (!$this->size && isset($infos['width']) && isset($infos['height']))
     {
@@ -168 +166 @@
     $tokens=array();
     $tokens[] = substr($params->type,0,2);
-
-    if ($params->sizing->max_crop != 0 and !empty($src->coi))
-    {
-      $tokens[] = 'ci'.$src->coi;
-    }
 
     if ($params->type==IMG_CUSTOM)
@@ -258 +251 @@
       return $this->src_image->get_size();
     }
-    return $this->params->compute_final_size($this->src_image->get_size(), $this->src_image->coi);
+    return $this->params->compute_final_size($this->src_image->get_size());
   }
 

trunk/include/derivative_params.inc.php

@@ -46 +46 @@
 function fraction_to_char($f)
 {
-        return ord('a') + round($f*25);
+        return chr(ord('a') + round($f*25));
 }
 
@@ -258 +258 @@
   }
 
-  function compute_final_size($in_size, $coi)
-  {
-    $this->sizing->compute( $in_size, $coi, $crop_rect, $scale_size );
+  function compute_final_size($in_size)
+  {
+    $this->sizing->compute( $in_size, null, $crop_rect, $scale_size );
     return $scale_size != null ? $scale_size : $in_size;
   }

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()
   {