aboutsummaryrefslogtreecommitdiffstats
path: root/include/derivative.inc.php
diff options
context:
space:
mode:
authorrvelices <rv-github@modusoptimus.com>2012-02-06 20:59:20 +0000
committerrvelices <rv-github@modusoptimus.com>2012-02-06 20:59:20 +0000
commit0d277219fc5fea718d27d80e7ae68b6f4c2f4c4a (patch)
tree0a45bd317b98f2292efe38c8aaf53c163c31e286 /include/derivative.inc.php
parent8d86e7b399fbda576306453c332cd9daeb44bdde (diff)
multisize - added the coi (still to affine the admin ui + language)
multisize - derivatives can be revuild from a larger derviative instead of the original git-svn-id: http://piwigo.org/svn/trunk@13038 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r--include/derivative.inc.php11
1 files changed, 2 insertions, 9 deletions
diff --git a/include/derivative.inc.php b/include/derivative.inc.php
index 0ba906461..6d0055def 100644
--- a/include/derivative.inc.php
+++ b/include/derivative.inc.php
@@ -27,14 +27,13 @@ final class SrcImage
public $id;
public $rel_path;
- public $coi=null;
private $size=null;
private $flags=0;
function __construct($infos)
{
global $conf;
-
+
$this->id = $infos['id'];
$ext = get_extension($infos['path']);
if (in_array($ext, $conf['picture_ext']))
@@ -54,7 +53,6 @@ final class SrcImage
$this->size = @getimagesize(PHPWG_ROOT_PATH.$this->rel_path);
}
- $this->coi = @$infos['coi'];
if (!$this->size && isset($infos['width']) && isset($infos['height']))
{
$this->size = array($infos['width'], $infos['height']);
@@ -168,11 +166,6 @@ final class DerivativeImage
$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)
{
$params->add_url_tokens($tokens);
@@ -257,7 +250,7 @@ final class DerivativeImage
{
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());
}
function get_size_htm()