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
Piwigo · Jun 29, 2012 · 60c264d · 60c264d
1 parent cc2faea
commit 60c264d
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/admin/include/image.class.php b/admin/include/image.class.php
@@ -607,7 +607,13 @@ function write($destination_filepath)
   {
     $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).'"';