mirror of
https://github.com/Piwigo/Piwigo.git
synced 2026-08-09 02:03:18 +02:00
feature:2284
Create a class to manipulate images. git-svn-id: http://piwigo.org/svn/trunk@10641 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
@@ -321,6 +321,15 @@ $conf['insensitive_case_logon'] = false;
|
||||
// 'filename'
|
||||
$conf['uniqueness_mode'] = 'md5sum';
|
||||
|
||||
// Library used for image resizing. Value could be 'auto', 'imagick',
|
||||
// 'ext_imagick or 'gd'. If value is 'auto', library will be choosen in this
|
||||
// order. If choosen library is not available, another one will be picked up.
|
||||
$conf['image_library'] = 'auto';
|
||||
|
||||
// If library used is external installation of ImageMagick ('ext_imagick'),
|
||||
// you can define imagemagick directory.
|
||||
$conf['ext_imagick_dir'] = '';
|
||||
|
||||
// +-----------------------------------------------------------------------+
|
||||
// | metadata |
|
||||
// +-----------------------------------------------------------------------+
|
||||
|
||||
@@ -2688,6 +2688,7 @@ function ws_images_resize($params, &$service)
|
||||
|
||||
include_once(PHPWG_ROOT_PATH.'include/functions_picture.inc.php');
|
||||
include_once(PHPWG_ROOT_PATH.'admin/include/functions_upload.inc.php');
|
||||
include_once(PHPWG_ROOT_PATH.'admin/include/image.class.php');
|
||||
|
||||
if (!empty($params['image_id']))
|
||||
{
|
||||
@@ -2725,32 +2726,36 @@ SELECT id, path, tn_ext, has_high
|
||||
{
|
||||
prepare_directory(dirname($thumb_path));
|
||||
|
||||
$result = trigger_event(
|
||||
'upload_thumbnail_resize',
|
||||
false,
|
||||
$image_path,
|
||||
$img = new pwg_image($image_path, $params['library']);
|
||||
|
||||
$result = $img->pwg_resize(
|
||||
$thumb_path,
|
||||
$params['maxwidth'],
|
||||
$params['maxheight'],
|
||||
$params['quality'],
|
||||
$params['automatic_rotation'],
|
||||
true,
|
||||
get_boolean($params['crop']),
|
||||
get_boolean($params['follow_orientation'])
|
||||
);
|
||||
|
||||
$img->destroy();
|
||||
}
|
||||
elseif (file_exists($hd_path))
|
||||
{
|
||||
$result = trigger_event(
|
||||
'upload_image_resize',
|
||||
false,
|
||||
$hd_path,
|
||||
$img = new pwg_image($hd_path);
|
||||
|
||||
$result = $img->pwg_resize(
|
||||
$image_path,
|
||||
$params['maxwidth'],
|
||||
$params['maxheight'],
|
||||
$params['quality'],
|
||||
$params['automatic_rotation'],
|
||||
false
|
||||
);
|
||||
|
||||
$img->destroy();
|
||||
|
||||
if (!empty($image['has_high']))
|
||||
{
|
||||
$conf['use_exif'] = false;
|
||||
|
||||
Reference in New Issue
Block a user