Ticket #42663: imagick.2.diff

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

@@ -21 +21 @@
          */
         protected $image;
 
+        static protected $can_use_filehandles = false;
+
         public function __destruct() {
                 if ( $this->image instanceof Imagick ) {
                         // we don't need the original in memory anymore
@@ -82 +84 @@
                         return false;
                 }
 
+                if ( in_array( 'writeimagefile', $class_methods ) && in_array( 'readimagefile', $class_methods ) ) {
+                        self::$can_use_filehandles = true;
+                }
+
                 // HHVM Imagick does not support loading from URL, so fail to allow fallback to GD.
                 if ( defined( 'HHVM_VERSION' ) && isset( $args['path'] ) && preg_match( '|^https?://|', $args['path'] ) ) {
                         return false;
@@ -150 +156 @@
 
                         // Reading image after Imagick instantiation because `setResolution`
                         // only applies correctly before the image is read.
-                        $this->image->readImage( $filename );
+                        if ( self::$can_use_filehandles ) {
+                                $this->image->readImageFile( fopen( $filename, 'rb' ) );
+                        } else {
+                                $this->image->readImage( $filename );
+                        }
 
                         if ( ! $this->image->valid() )
                                 return new WP_Error( 'invalid_image', __('File is not an image.'), $this->file);
@@ -623 +633 @@
                         $orig_format = $this->image->getImageFormat();
 
                         $this->image->setImageFormat( strtoupper( $this->get_extension( $mime_type ) ) );
-                        $this->make_image( $filename, array( $image, 'writeImage' ), array( $filename ) );
+                        if ( self::$can_use_filehandles ) {
+                                $fp = fopen( $filename, 'wb' );
+                                $this->make_image( $filename, array( $image, 'writeImageFile' ), array( $fp ) );
+                        } else {
+                                $this->make_image( $filename, array( $image, 'writeImage' ), array( $filename ) );
+                        }
 
                         // Reset original Format
                         $this->image->setImageFormat( $orig_format );