Changeset 16230 for trunk/admin

Timestamp:

Jun 30, 2012, 9:23:43 PM (12 years ago)

Author:

rvelices

Message:

bug 2672: invalid option sampling-factor for old versions of ImageMagick (use it for new versions)

File:

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

trunk/admin/include/image.class.php

@@ -59 +59 @@
   var $library = '';
   var $source_filepath = '';
+  static $ext_imagick_version = '';
 
   function __construct($source_filepath, $library=null)
@@ -340 +341 @@
     if (is_array($returnarray) and !empty($returnarray[0]) and preg_match('/ImageMagick/i', $returnarray[0]))
     {
+      if (preg_match('/Version: ImageMagick (\d+\.\d+\.\d+-?\d*)/', $returnarray[0], $match))
+      {
+        self::$ext_imagick_version = $match[1];
+      }
       return true;
     }
@@ -447 +452 @@
   {
     $this->image->setInterlaceScheme(Imagick::INTERLACE_LINE);
-    
+
     // TODO need to explain this condition
     if ($this->get_width()%2 == 0
@@ -614 +619 @@
     // option
     //
-    // $this->add_command('sampling-factor', '4:2:2' );
+    if (version_compare(pwg_image::$ext_imagick_version, '6.6') > 0)
+    {
+      $this->add_command('sampling-factor', '4:2:2' );
+    }
 
     $exec = $this->imagickdir.'convert';