Fixed bug #13283: Thumbnail generation broken for PDF files

git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@7106 709f56b5-9817-0410-a4d7-c38de5d9e867

diff --git a/ChangeLog b/ChangeLog
index 0d4b541..c634a30 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-03-14  Oliver Hader  <oliver@typo3.org>
+
+       * Fixed bug #13283: Thumbnail generation broken for PDF files (thanks to Michael Stucki & Andy Grunwald)
+
 2010-03-14  Jochen Rau <jochen.rau@typoplanet.de>
 
        * Fixed bug #13371: cropHTML not honoring whole word setting

diff --git a/t3lib/class.t3lib_stdgraphic.php b/t3lib/class.t3lib_stdgraphic.php
index 72eff74..c28d018 100644 (file)
--- a/t3lib/class.t3lib_stdgraphic.php
+++ b/t3lib/class.t3lib_stdgraphic.php
@@ -2657,13 +2657,22 @@ class t3lib_stdGraphic  {
         * @param       string          The relative (to PATH_site) image filepath, input file (read from)
         * @param       string          The relative (to PATH_site) image filepath, output filename (written to)
         * @param       string          ImageMagick parameters
-        * @param       string          Refers to which frame-number to select in the image. '' or 0 will select the first frame, 1 will select the next and so on...
+        * @param       integer         Optional, refers to which frame-number to select in the image. '' or 0
+        *                              will select the first frame, 1 will select the next and so on...
         * @return      string          The result of a call to PHP function "exec()"
         */
-       function imageMagickExec($input,$output,$params,$frame = 0)     {
-               if (!$this->NO_IMAGE_MAGICK)    {
-                       $frame = $frame ? '['.intval($frame).']' : '';
-                       $cmd = t3lib_div::imageMagickCommand('convert', $params.' '.$this->wrapFileName($input).$frame.' '.$this->wrapFileName($output));
+       function imageMagickExec($input, $output, $params, $frame = 0) {
+               if (!$this->NO_IMAGE_MAGICK) {
+
+                               // Unless noFramePrepended is set in the Install Tool, a frame number is added to
+                               // select a specific page of the image (by default this will be the first page)
+                       if (!$this->noFramePrepended) {
+                               $frame = '[' . intval($frame) . ']';
+                       } else {
+                               $frame = '';
+                       }
+
+                       $cmd = t3lib_div::imageMagickCommand('convert', $params . ' ' . $this->wrapFileName($input) . $frame . ' ' . $this->wrapFileName($output));
                        $this->IM_commands[] = array($output,$cmd);
 
                        $ret = exec($cmd);