# HG changeset patch # User Matti Hamalainen # Date 1417156832 -7200 # Node ID 6549fb84a814558edd3b3124d103d8f2e78a3648 # Parent 527e62f39af62e07476253512fc27f0a6f6bab5b Rename a variable. diff -r 527e62f39af6 -r 6549fb84a814 faptool.php --- a/faptool.php Fri Nov 28 08:18:37 2014 +0200 +++ b/faptool.php Fri Nov 28 08:40:32 2014 +0200 @@ -25,14 +25,14 @@ if ($inFileType == "gfx") { // Oh great .. we need gfxconv here because Imagick handles ILBM like shit - $filename = tempnam($setPreviewPath, "tmp"); + $tmpFilename = tempnam($setPreviewPath, "tmp"); $isTemp = TRUE; if (wtExec( "/usr/local/bin/gfxconv", - escapeshellarg($inFilename)." -f png -o ".escapeshellarg($filename)) === false) + escapeshellarg($inFilename)." -f png -o ".escapeshellarg($tmpFilename)) === false) return FALSE; - if (!file_exists($filename)) + if (!file_exists($tmpFilename)) { echo "ERROR: gfxconv did not output a temporary conversion inbetween.\n"; return FALSE; @@ -40,16 +40,16 @@ } else - $filename = $inFilename; + $tmpFilename = $inFilename; // convert -resize 640x480 -background black -gravity center -extent 640x480 // -unsharp "0x0.75+0.75+0.008" lol.lbm -quality 95 test.jpg // Create conversion entity - $img = new Imagick($filename); + $img = new Imagick($tmpFilename); if ($img === false) { - echo "ERROR: Oh noes! ImageMagick could not digest the file '".$filename."' (".$inFilename.")\n"; + echo "ERROR: Oh noes! ImageMagick could not digest the file '".$tmpFilename."' (".$inFilename.")\n"; return FALSE; }