Changeset 378

Timestamp:

Dec 21, 2010 9:44:41 PM (13 years ago)

Author:

anonymous

Message:

Source file bug in ImageThumb?

File:

• branches/1.1dev/lib/ImageThumb.inc.php (modified) (3 diffs)

branches/1.1dev/lib/ImageThumb.inc.php

@@ -185 +185 @@
     function processFile($file_name)
     {
+        // Source file determined by provided file_name.
+        $source_file = realpath($this->source_dir . '/' . $file_name);
+
         // Ensure we have valid binaries.
         if (!$this->_valid_binaries) {
@@ -252 +255 @@
             
             // Determine if original file size is smaller than specified thumbnail size. Do not scale-up if allow_upscaling config is set to false.
-            $image_size = getimagesize(realpath($this->source_dir . '/' . $file_name));
+            $image_size = getimagesize($source_file);
             if ($image_size['0'] <= $s['width'] && $image_size['1'] <= $s['height'] && !$s['allow_upscaling']) {
                 $pnmscale_args = ' 1 ';
-                logMsg(sprintf('Image %s smaller than specified %s thumbnail size. Keeping original size.', $file_name, $s['dest_dir']), LOG_DEBUG, __FILE__, __LINE__);
+                logMsg(sprintf('Image %s smaller (%sx%s) than specified %s thumbnail size (%sx%s). Keeping original size.', $source_file, $image_size['0'], $image_size['1'], $s['dest_dir'], $s['width'], $s['height']), LOG_DEBUG, __FILE__, __LINE__);
             } else {
                 $pnmscale_args = $s['pnmscale_args'];
@@ -261 +264 @@
             
             // Execute the command that creates the thumbnail.
-            $command = sprintf('%s %s/%s | %s %s | %s %s > %s/%s',
+            $command = sprintf('%s %s | %s %s | %s %s > %s/%s',
                 escapeshellcmd($this->anytopnm_binary),
-                escapeshellcmd($this->source_dir),
-                escapeshellcmd($file_name),
+                escapeshellcmd($source_file),
                 escapeshellcmd($this->pnmscale_binary),
                 escapeshellcmd($pnmscale_args),