mirrors/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2025-04-26 19:29:58 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

bug 2712: Custom sized derivatives are never sharpened

Browse source 
git-svn-id: http://piwigo.org/svn/trunk@17230 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
rvelices 2012-07-30 20:01:17 +00:00
parent 26db3dde8f
commit 214a3c9dab
1 changed files with 12 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

14
i.php
View file

@ -299,7 +299,7 @@ function try_switch_source(DerivativeParams $params, $original_mtime)
if ($use_watermark) if ($use_watermark)
{ {
if (!isset($original_size)) if (!isset($original_size))
return; // cannot really know if a watermark is required return false; // cannot really know if a watermark is required
$dsize = $params->compute_final_size($original_size); $dsize = $params->compute_final_size($original_size);
$use_watermark = $params->will_watermark($dsize); $use_watermark = $params->will_watermark($dsize);
ilog($use_watermark, $dsize); ilog($use_watermark, $dsize);
@ -346,7 +346,9 @@ function try_switch_source(DerivativeParams $params, $original_mtime)
$page['src_path'] = $candidate_path; $page['src_path'] = $candidate_path;
$page['src_url'] = $page['root_path'] . substr($candidate_path, strlen(PHPWG_ROOT_PATH)); $page['src_url'] = $page['root_path'] . substr($candidate_path, strlen(PHPWG_ROOT_PATH));
$page['rotation_angle'] = 0; $page['rotation_angle'] = 0;
return true;
} }
return false;
} }
function send_derivative($expires) function send_derivative($expires)
@ -515,7 +517,15 @@ else
} }
mysql_close($pwg_db_link); mysql_close($pwg_db_link);
try_switch_source($params, $src_mtime); if (!try_switch_source($params, $src_mtime) && $params->type==IMG_CUSTOM)
{
$sharpen = 0;
foreach (ImageStdParams::get_defined_type_map() as $std_params)
{
$sharpen += $std_params->sharpen;
}
$params->sharpen = round($sharpen / count(ImageStdParams::get_defined_type_map()) );
}
if (!mkgetdir(dirname($page['derivative_path']))) if (!mkgetdir(dirname($page['derivative_path'])))
{ {