aboutsummaryrefslogtreecommitdiffstats
path: root/admin/include/image.class.php
diff options
context:
space:
mode:
authorplegall <plg@piwigo.org>2012-06-29 22:24:24 +0000
committerplegall <plg@piwigo.org>2012-06-29 22:24:24 +0000
commit60c264d6dc69a85895bb7f0c5a61aed78594f683 (patch)
treeac005bc49b1af2386564cadc6528317ee55da5ca /admin/include/image.class.php
parentcc2faea84b44c0bed6efcff1d6a5aa66b8e861a4 (diff)
merge r16210 from branch 2.4 to trunk
bug 2672: deactivate sampling-factor (for now) git-svn-id: http://piwigo.org/svn/trunk@16211 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'admin/include/image.class.php')
-rw-r--r--admin/include/image.class.php8
1 files changed, 7 insertions, 1 deletions
diff --git a/admin/include/image.class.php b/admin/include/image.class.php
index 4eeceeb51..5ccab294f 100644
--- a/admin/include/image.class.php
+++ b/admin/include/image.class.php
@@ -607,7 +607,13 @@ class image_ext_imagick implements imageInterface
{
$this->add_command('interlace', 'line'); // progressive rendering
// use 4:2:2 chroma subsampling (reduce file size by 20-30% with "almost" no human perception)
- $this->add_command('sampling-factor', '4:2:2' );
+ //
+ // option deactivated for Piwigo 2.4.1, it doesn't work fo old versions
+ // of ImageMagick, see bug:2672. To reactivate once we have a better way
+ // to detect IM version and when we know which version supports this
+ // option
+ //
+ // $this->add_command('sampling-factor', '4:2:2' );
$exec = $this->imagickdir.'convert';
$exec .= ' "'.realpath($this->source_filepath).'"';