Changeset 11044

Timestamp:

May 25, 2011, 12:02:24 PM (14 years ago)

Author:

patdenice

Message:

feature:2284
Improve external image magick

File:

• trunk/admin/include/image.class.php (modified) (6 diffs)

trunk/admin/include/image.class.php

@@ -246 +246 @@
   }
 
-  private function get_resize_result($destination_filepath, $width, $height, $time)
+  private function get_resize_result($destination_filepath, $width, $height, $time=null)
   {
     return array(
@@ -254 +254 @@
       'height'      => $height,
       'size'        => floor(filesize($destination_filepath) / 1024).' KB',
-      'time'          => number_format((get_moment() - $time) * 1000, 2, '.', ' ').' ms',
+      'time'        => $time ? number_format((get_moment() - $time) * 1000, 2, '.', ' ').' ms' : null,
       'library'     => $this->library,
     );
@@ -317 +317 @@
         {
           // Requested library not available. Try another library
-          return self::get_library('auto');
+          return self::get_library('auto', $extension);
         }
     }
@@ -399 +399 @@
   var $imagickdir = '';
   var $source_filepath = '';
-  var $image_data = array();
+  var $width = '';
+  var $height = '';
   var $commands = array();
 
@@ -407 +408 @@
     $this->imagickdir = $imagickdir;
 
-    $command = $imagickdir.'identify -verbose "'.realpath($source_filepath).'"';
+    $command = $imagickdir.'identify -format "%wx%h" "'.realpath($source_filepath).'"';
     @exec($command, $returnarray, $returnvalue);
-    if($returnvalue)
+    if($returnvalue or !preg_match('/^(\d+)x(\d+)$/', $returnarray[0], $match))
     {
       die("[External ImageMagick] Corrupt image");
     }
 
-    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];
   }
 
@@ -431 +426 @@
   function get_width()
   {
-    preg_match('#^(\d+)x#', $this->image_data['Geometry'], $match);
-    return isset($match[1]) ? $match[1] : false;
+    return $this->width;
   }
 
   function get_height()
   {
-    preg_match('#^\d+x(\d+)(?:\+|$)#', $this->image_data['Geometry'], $match);
-    return isset($match[1]) ? $match[1] : false;
+    return $this->height;
   }