* Fixed bug #0000032: ImageMagick will convert only the first page of a multi-page...

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

diff --git a/ChangeLog b/ChangeLog
index 4e89aa9..d0c8979 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2004-06-18  Michael Stucki  <mundaun@gmx.ch>
+
+       * Fixed bug #0000032: ImageMagick will convert only the first page of a multi-page PDF file
+

 2004-06-11  Robert Lemke  <rl@robertlemke.de>
 
        * Created new hook in class.t3lib_tcemain.php in process_datamap. Search for $TYPO3_CONF_VARS['SC_OPTIONS']['t3lib/class.t3lib_tcemain.php']['processDatamapClass']
 2004-06-11  Robert Lemke  <rl@robertlemke.de>
 
        * Created new hook in class.t3lib_tcemain.php in process_datamap. Search for $TYPO3_CONF_VARS['SC_OPTIONS']['t3lib/class.t3lib_tcemain.php']['processDatamapClass']

diff --git a/t3lib/class.t3lib_stdgraphic.php b/t3lib/class.t3lib_stdgraphic.php
index 096f160..703c519 100644 (file)
--- a/t3lib/class.t3lib_stdgraphic.php
+++ b/t3lib/class.t3lib_stdgraphic.php
@@ -2081,7 +2081,8 @@ class t3lib_stdGraphic    {
         */
        function imageMagickIdentify($imagefile)        {
                if (!$this->NO_IMAGE_MAGICK)    {
         */
        function imageMagickIdentify($imagefile)        {
                if (!$this->NO_IMAGE_MAGICK)    {

-                       $cmd = $this->imageMagickPath.'identify '.$this->wrapFileName($imagefile);
+                       $frame = $this->noFramePrepended?'':'[0]';
+                       $cmd = $this->imageMagickPath.'identify '.$this->wrapFileName($imagefile).$frame;

                        exec($cmd, $returnVal);
                        $splitstring=$returnVal[0];
                        $this->IM_commands[] = Array ('identify',$cmd,$returnVal[0]);
                        exec($cmd, $returnVal);
                        $splitstring=$returnVal[0];
                        $this->IM_commands[] = Array ('identify',$cmd,$returnVal[0]);