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

Change syntax order of all imagemagick to match IM7 syntax

Browse Source
This commit is contained in:
RushLana
2025-12-26 09:13:29 +01:00
committed by Pierrick Le Gall
parent 2583591a64
commit ff633b7137
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/include/functions_upload.inc.php
+3 -4
View File
@@ -591,11 +591,11 @@ function upload_file_pdf($representative_ext, $file_path)
prepare_directory(dirname($representative_file_path)); prepare_directory(dirname($representative_file_path));
$exec = $conf['ext_imagick_dir'].pwg_image::get_ext_imagick_command(); $exec = $conf['ext_imagick_dir'].pwg_image::get_ext_imagick_command();
$exec.= ' "'.realpath($file_path).'"[0]';
if ('jpg' == $ext) if ('jpg' == $ext)
{ {
$exec.= ' -quality '.$jpg_quality; $exec.= ' -quality '.$jpg_quality;
} }
$exec.= ' "'.realpath($file_path).'"[0]';
$exec.= ' "'.$representative_file_path.'"'; $exec.= ' "'.$representative_file_path.'"';
$exec.= ' 2>&1'; $exec.= ' 2>&1';
@exec($exec, $returnarray); @exec($exec, $returnarray);
@@ -690,14 +690,13 @@ function upload_file_tiff($representative_ext, $file_path)
prepare_directory(dirname($representative_file_path)); prepare_directory(dirname($representative_file_path));
$exec = $conf['ext_imagick_dir'].pwg_image::get_ext_imagick_command(); $exec = $conf['ext_imagick_dir'].pwg_image::get_ext_imagick_command();
$exec .= ' "'.realpath($file_path).'"';
if ('jpg' == $conf['tiff_representative_ext']) if ('jpg' == $conf['tiff_representative_ext'])
{ {
$exec .= ' -quality 98'; $exec .= ' -quality 98';
} }
$exec .= ' "'.realpath($file_path).'"';
$dest = pathinfo($representative_file_path); $dest = pathinfo($representative_file_path);
$exec .= ' "'.realpath($dest['dirname']).'/'.$dest['basename'].'"'; $exec .= ' "'.realpath($dest['dirname']).'/'.$dest['basename'].'"';
@@ -899,8 +898,8 @@ function upload_file_eps($representative_ext, $file_path)
// convert -density 300 image.eps -resize 2048x2048 image.png // convert -density 300 image.eps -resize 2048x2048 image.png
$exec = $conf['ext_imagick_dir'].pwg_image::get_ext_imagick_command(); $exec = $conf['ext_imagick_dir'].pwg_image::get_ext_imagick_command();
$exec.= ' -density 300';
$exec.= ' "'.realpath($file_path).'"'; $exec.= ' "'.realpath($file_path).'"';
$exec.= ' -density 300';
$exec.= ' -resize 2048x2048'; $exec.= ' -resize 2048x2048';
$exec.= ' "'.$representative_file_path.'"'; $exec.= ' "'.$representative_file_path.'"';
$exec.= ' 2>&1'; $exec.= ' 2>&1';