Changeset 11650 for extensions/external_ImageMagick

Timestamp:

Jul 6, 2011, 5:48:09 PM (13 years ago)

Author:

patdenice

Message:

Avoid errors with some pictures...

File:

• extensions/external_ImageMagick/trunk/imagick.class.php (modified) (5 diffs)

extensions/external_ImageMagick/trunk/imagick.class.php

@@ -7 +7 @@
   var $imagemagickdir = '';
   var $commands = array();
+  var $width = '';
+  var $height = '';
 
   const INTERLACE_NO = 'none';
@@ -50 +52 @@
       $this->imagemagickdir = rtrim($conf['imagick_dir'], ' /\\').'/';
 
-    $command = $this->imagemagickdir."identify -verbose ".realpath($this->source_path);
+    $command = $this->imagemagickdir.'identify -format "%wx%h" "'.realpath($this->source_path).'"';
     @exec($command, $returnarray, $returnvalue);
-    if($returnvalue)
+    if($returnvalue or !preg_match('/^(\d+)x(\d+)$/', $returnarray[0], $match))
     {
-      die("ImageMagick: Corrupt image");
+      die("[External ImageMagick] Corrupt image");
     }
-    else
-    {
-      foreach($returnarray as $value)
-      {
-        $arr = explode(':', $value, 2);
-        if (count($arr) == 2)
-        {
-          $this->image_data[trim($arr[0])] = trim($arr[1]);
-        }
-      }
-    }
+
+    $this->width = $match[1];
+    $this->height = $match[2];
   }
 
@@ -76 +70 @@
   function getImageWidth()
   {
-    preg_match('#^(\d+)x#', $this->image_data['Geometry'], $match);
-    return isset($match[1]) ? $match[1] : false;
+    return $this->width;
   }
 
   function getImageHeight()
   {
-    preg_match('#^\d+x(\d+)(?:\+|$)#', $this->image_data['Geometry'], $match);
-    return isset($match[1]) ? $match[1] : false;
+    return $this->height;
   }
 
@@ -128 +120 @@
 
     $exec = $this->imagemagickdir.'convert';
-    $exec .= ' '.realpath($this->source_path);
+    $exec .= ' "'.realpath($this->source_path).'"';
 
     foreach ($this->commands as $command => $params)
@@ -140 +132 @@
 
     $dest = pathinfo($destination_filepath);
-    $exec .= ' '.realpath($dest['dirname']).'/'.$dest['basename'];
+    $exec .= ' "'.realpath($dest['dirname']).'/'.$dest['basename'].'"';
     @exec($exec, $returnarray, $returnvalue);
   }