Ticket #21668: 21668.5.patch

wp-includes/class-wp-image-editor-gd.php

@@ -344 +344 @@
                 if ( ! $filename )
                         $filename = $this->generate_filename( null, null, $extension );
 
+                if ( function_exists( 'imageinterlace' ) )
+                        imageinterlace( $image, apply_filters( 'image_save_progressive', false, $mime_type ) );
+
                 if ( 'image/gif' == $mime_type ) {
                         if ( ! $this->make_image( $filename, 'imagegif', array( $image, $filename ) ) )
                                 return new WP_Error( 'image_save_error', __('Image Editor Save Failed') );
@@ -389 +392 @@
         public function stream( $mime_type = null ) {
                 list( $filename, $extension, $mime_type ) = $this->get_output_format( null, $mime_type );
 
+                if ( function_exists( 'imageinterlace' ) )
+                        imageinterlace( $image, apply_filters( 'image_save_progressive', false, $mime_type ) );
+
                 switch ( $mime_type ) {
                         case 'image/png':
                                 header( 'Content-Type: image/png' );

wp-includes/class-wp-image-editor-imagick.php

@@ -55 +55 @@
                         'getimageblob',
                         'getimagegeometry',
                         'getimageformat',
+                        'getinterlacescheme',
                         'setimageformat',
                         'setimagecompression',
                         'setimagecompressionquality',
                         'setimagepage',
+                        'setinterlacescheme',
                         'scaleimage',
                         'cropimage',
                         'rotateimage',
@@ -67 +69 @@
                 );
 
                 // Now, test for deep requirements within Imagick.
-                if ( ! defined( 'imagick::COMPRESSION_JPEG' ) )
+                if ( ! defined( 'Imagick::COMPRESSION_JPEG' ) || ! defined( 'Imagick::INTERLACE_PLANE' ) || ! defined( 'Imagick::INTERLACE_LINE' ) )
                         return false;
 
                 if ( array_diff( $required_methods, get_class_methods( 'Imagick' ) ) )
@@ -420 +422 @@
                 try {
                         // Store initial Format
                         $orig_format = $this->image->getImageFormat();
+                        $orig_interlace = $this->image->getImageInterlaceScheme();
 
                         $this->image->setImageFormat( strtoupper( $this->get_extension( $mime_type ) ) );
+                        if ( apply_filters( 'image_save_progressive', false, $mime_type ) ) {
+                                $this->image->setImageInterlaceScheme(
+                                        strtoupper( $mime_type ) == 'PNG' ?
+                                                Imagick::INTERLACE_PLANE :
+                                                Imagick::INTERLACE_LINE
+                                );
+                        }
                         $this->make_image( $filename, array( $image, 'writeImage' ), array( $filename ) );
 
                         // Reset original Format
                         $this->image->setImageFormat( $orig_format );
+                        $this->image->setInterlaceScheme( $orig_interlace );
                 }
                 catch ( Exception $e ) {
                         return new WP_Error( 'image_save_error', $e->getMessage(), $filename );