Ticket #21668: 21668.4.patch

wp-admin/includes/image-edit.php

@@ -217 +217 @@
                 switch ( $mime_type ) {
                         case 'image/jpeg':
                                 header( 'Content-Type: image/jpeg' );
+                                if ( function_exists('imageinterlace') )
+                                        imageinterlace( $image, true );
                                 return imagejpeg( $image, null, 90 );
                         case 'image/png':
                                 header( 'Content-Type: image/png' );
@@ -259 +261 @@
 
                 switch ( $mime_type ) {
                         case 'image/jpeg':
+                                if ( function_exists('imageinterlace') )
+                                        imageinterlace( $image, true );
                                 return imagejpeg( $image, $filename, apply_filters( 'jpeg_quality', 90, 'edit_image' ) );
                         case 'image/png':
                                 return imagepng( $image, $filename );

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

@@ -357 +357 @@
                                 return new WP_Error( 'image_save_error', __('Image Editor Save Failed') );
                 }
                 elseif ( 'image/jpeg' == $mime_type ) {
+                        if ( function_exists('imageinterlace') )
+                                imageinterlace( $image, true );
                         if ( ! $this->make_image( $filename, 'imagejpeg', array( $image, $filename, apply_filters( 'jpeg_quality', $this->quality, 'image_resize' ) ) ) )
                                 return new WP_Error( 'image_save_error', __('Image Editor Save Failed') );
                 }
@@ -398 +400 @@
                                 return imagegif( $this->image );
                         default:
                                 header( 'Content-Type: image/jpeg' );
+                                if ( function_exists('imageinterlace') )
+                                        imageinterlace( $this->image, true );
                                 return imagejpeg( $this->image, null, $this->quality );
                 }
         }

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') )
                         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 ) ) );
+                        $this->image->setInterlaceScheme( Imagick::INTERLACE_PLANE );
                         $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 );