adam/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-06-02 04:15:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

feature 2548 multisize - ability to choose displayed size on index page

Browse Source 
-added some logs on i.php (configurable) to measure the perf

git-svn-id: http://piwigo.org/svn/trunk@12908 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
rvelices
2012-01-17 06:09:32 +00:00
parent b18e3c8a80
commit e693ef60cd
18 changed files with 183 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/derivative.inc.php
+3 -9
View File
@@ -100,8 +100,6 @@ final class DerivativeImage
public $src_image;
private $requested_type;
private $flags = 0;
private $params;
private $rel_path, $rel_url;
@@ -111,12 +109,10 @@ final class DerivativeImage
$this->src_image = $src_image;
if (is_string($type))
{
$this->requested_type = $type;
$this->params = ImageStdParams::get_by_type($type);
}
else
{
$this->requested_type = IMG_CUSTOM;
$this->params = $type;
}
@@ -125,14 +121,12 @@ final class DerivativeImage
static function thumb_url($infos)
{
$src_image = new SrcImage($infos);
self::build($src_image, ImageStdParams::get_by_type(IMG_THUMB), $rel_path, $rel_url);
return get_root_url().$rel_url;
return self::url(IMG_THUMB, $infos);
}
static function url($type, $infos)
{
$src_image = new SrcImage($infos);
$src_image = is_object($infos) ? $infos : new SrcImage($infos);
$params = is_string($type) ? ImageStdParams::get_by_type($type) : $type;
self::build($src_image, $params, $rel_path, $rel_url);
return get_root_url().$rel_url;
@@ -257,7 +251,7 @@ final class DerivativeImage
$size = $this->get_size();
if ($size)
{
return 'width="'.$size[0].'" height="'.$size[1].'"';
return 'width='.$size[0].' height='.$size[1];
}
}