aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrvelices <rv-github@modusoptimus.com>2012-07-01 04:18:34 +0000
committerrvelices <rv-github@modusoptimus.com>2012-07-01 04:18:34 +0000
commit3aa529809eacdbf4a0132ca5f62c1121f64d7347 (patch)
tree7da418352c8a4e18cc95aaf07ccb7ba59457f5f4
parent9ee698734df58a4c126b618f1e60ad61214429d4 (diff)
bug 2672: invalid option sampling-factor for old versions of ImageMagick (use it for new versions) merge from trunk to branch 2.4
git-svn-id: http://piwigo.org/svn/branches/2.4@16242 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r--admin/include/image.class.php12
1 files changed, 10 insertions, 2 deletions
diff --git a/admin/include/image.class.php b/admin/include/image.class.php
index 5ccab294f..463abe39e 100644
--- a/admin/include/image.class.php
+++ b/admin/include/image.class.php
@@ -58,6 +58,7 @@ class pwg_image
var $image;
var $library = '';
var $source_filepath = '';
+ static $ext_imagick_version = '';
function __construct($source_filepath, $library=null)
{
@@ -339,6 +340,10 @@ class pwg_image
@exec($conf['ext_imagick_dir'].'convert -version', $returnarray);
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;
}
return false;
@@ -446,7 +451,7 @@ class image_imagick implements imageInterface
function resize($width, $height)
{
$this->image->setInterlaceScheme(Imagick::INTERLACE_LINE);
-
+
// TODO need to explain this condition
if ($this->get_width()%2 == 0
&& $this->get_height()%2 == 0
@@ -613,7 +618,10 @@ class image_ext_imagick implements imageInterface
// to detect IM version and when we know which version supports this
// 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';
$exec .= ' "'.realpath($this->source_filepath).'"';