archive/piwigo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merge r23498 from branch 2.5 to trunk

Browse source 
feature 2929: strip metadata on configurable threshold



git-svn-id: http://piwigo.org/svn/trunk@23499 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
plegall 2013-06-24 13:34:03 +00:00
parent e41f9bddc9
commit f599ea711c
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
i.php
View file

@ -609,7 +609,7 @@ if (!$changes)
ierror( $page['src_url'], 301);
}
if ($d_size[0]*$d_size[1] < 256000)
if ($d_size[0]*$d_size[1] < $conf['derivatives_strip_metadata_threshold'])
{// strip metadata for small images
$image->strip();
}

4
include/config_default.inc.php
View file

@ -780,6 +780,10 @@ $conf['chmod_value']= substr_compare(PHP_SAPI, 'apa', 0, 3)==0 ? 0777 : 0755;
// 'small', 'medium' or 'large'
$conf['derivative_default_size'] = 'medium';
// below which size (in pixels, ie width*height) do we remove metadata
// EXIF/IPTC... from derivative?
$conf['derivatives_strip_metadata_threshold'] = 256000;
//Maximum Ajax requests at once, for thumbnails on-the-fly generation
$conf['max_requests']=3;