Changeset 13038 for trunk/include/derivative.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.inc.php (modified) (5 diffs)

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());
   }