mirror of
https://github.com/Piwigo/Piwigo.git
synced 2026-05-14 13:26:01 +02:00
Change graphic library priority, ext_imagemick is now preffered
This commit is contained in:
committed by
Pierrick Le Gall
parent
61961bd172
commit
66df209632
@@ -3726,6 +3726,14 @@ function get_graphics_library()
|
||||
|
||||
switch (pwg_image::get_library())
|
||||
{
|
||||
case 'ext_imagick':
|
||||
exec($conf['ext_imagick_dir'].'convert -version', $returnarray);
|
||||
if (preg_match('/Version: ImageMagick (\d+\.\d+\.\d+-?\d*)/', $returnarray[0], $match))
|
||||
{
|
||||
$library.= '/'.$match[1];
|
||||
}
|
||||
break;
|
||||
|
||||
case 'imagick':
|
||||
$img = new Imagick();
|
||||
$version = $img->getVersion();
|
||||
@@ -3735,14 +3743,6 @@ function get_graphics_library()
|
||||
}
|
||||
break;
|
||||
|
||||
case 'ext_imagick':
|
||||
exec($conf['ext_imagick_dir'].'convert -version', $returnarray);
|
||||
if (preg_match('/Version: ImageMagick (\d+\.\d+\.\d+-?\d*)/', $returnarray[0], $match))
|
||||
{
|
||||
$library.= '/'.$match[1];
|
||||
}
|
||||
break;
|
||||
|
||||
case 'gd':
|
||||
$gd_info = gd_info();
|
||||
$library.= '/'.@$gd_info['GD Version'];
|
||||
|
||||
Reference in New Issue
Block a user