james/fembooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix for resize arg isssue

Browse Source
This commit is contained in:
Matthew Barbour 2019-06-27 19:20:22 -05:00 committed by matthew
parent 9ce5a05840
commit f2496b99f6
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ext/media/main.php
View File

@ -781,7 +781,9 @@ class Media extends Extension
$args = " -flatten ";
if ($minimize) {
$args = " -strip -thumbnail";
$args .= " -strip -thumbnail";
} else {
$args .= " -resize";
}
$resize_args = "";
@ -803,7 +805,7 @@ class Media extends Extension
$output_ext = self::determine_ext($output_type);
$format = '"%s" %s -resize %ux%u%s -quality %u -background %s %s"%s[0]" %s:"%s" 2>&1';
$format = '"%s" %s %ux%u%s -quality %u -background %s %s"%s[0]" %s:"%s" 2>&1';
$cmd = sprintf($format, $convert, $args, $new_width, $new_height, $resize_args, $output_quality, $bg, $input_type, $input_path, $output_ext, $output_filename);
$cmd = str_replace("\"convert\"", "convert", $cmd); // quotes are only needed if the path to convert contains a space; some other times, quotes break things, see github bug #27
exec($cmd, $output, $ret);