badmanners/shimmie2
badmanners/shimmie2
Archived
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix pixel thumb gen

Browse source
This commit is contained in:
Shish 2010-01-27 12:25:19 +00:00
parent 5ddaed8e28
commit facff9bd5b
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ext/handle_pixel/main.php
View file

@ -75,11 +75,8 @@ class PixelFileHandler extends DataHandlerExtension {
// can end up with 3KB of jpg data and 200KB of misc extra... // can end up with 3KB of jpg data and 200KB of misc extra...
// "-limit memory $mem" broken? // "-limit memory $mem" broken?
// Windows is a special case, use what will work on most everything else first // Windows is a special case
if(in_array("OS", $_SERVER) && $_SERVER["OS"] != 'Windows_NT') { if(in_array("OS", $_SERVER) && $_SERVER["OS"] == 'Windows_NT') {
$cmd = "convert {$inname}[0] -strip -thumbnail {$w}x{$h} jpg:$outname";
}
else {
$imageMagick = $config->get_string("thumb_convert_path"); $imageMagick = $config->get_string("thumb_convert_path");
// running the call with cmd.exe requires quoting for our paths // running the call with cmd.exe requires quoting for our paths
@ -88,6 +85,9 @@ class PixelFileHandler extends DataHandlerExtension {
// Concat the command altogether // Concat the command altogether
$cmd = sprintf($stringFormat, $imageMagick, $inname, $w, $h, $outname); $cmd = sprintf($stringFormat, $imageMagick, $inname, $w, $h, $outname);
} }
else {
$cmd = "convert {$inname}[0] -strip -thumbnail {$w}x{$h} jpg:$outname";
}
// Execute IM's convert command, grab the output and return code it'll help debug it // Execute IM's convert command, grab the output and return code it'll help debug it
exec($cmd, $output, $ret); exec($cmd, $output, $ret);