Ticket #39216: 39216.patch

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

@@ -146 +146 @@
 
                 try {
                         $this->image = new Imagick();
-                        $file_parts = pathinfo( $this->file );
+                        $is_pdf = 'pdf' === strtolower( pathinfo( $this->file, PATHINFO_EXTENSION ) );
                         $filename = $this->file;
 
-                        if ( 'pdf' == strtolower( $file_parts['extension'] ) ) {
+                        if ( $is_pdf ) {
                                 $filename = $this->pdf_setup();
                         }
 
@@ -164 +164 @@
                         if ( is_callable( array( $this->image, 'setIteratorIndex' ) ) )
                                 $this->image->setIteratorIndex(0);
 
+                        if ( $is_pdf ) {
+                                $this->pdf_process();
+                        }
+
                         $this->mime_type = $this->get_mime_type( $this->image->getImageFormat() );
                 }
                 catch ( Exception $e ) {
@@ -761 +765 @@
                 }
         }
 
+        /**
+         * Process PDF after it's been read.
+         * Remove alpha channel to avoid black backgrounds.
+         *
+         * @since 4.x
+         * @access protected
+         *
+         * @return void
+         */
+        protected function pdf_process() {
+                // Remove alpha channel if possible to avoid black backgrounds. RemoveAlphaChannel added in ImageMagick 6.7.5.
+                $version = Imagick::getVersion();
+                if ( $version['versionNumber'] >= 0x675 ) {
+                        try {
+                                // Imagick::ALPHACHANNEL_REMOVE mapped to RemoveAlphaChannel in PHP imagick 3.2.0b2.
+                                // Value seems to have remained stable at 12 for ImageMagick 6.7.5 to 7.0 (although other AlphaChannelType enum values have changed).
+                                $this->image->setImageAlphaChannel( defined( 'Imagick::ALPHACHANNEL_REMOVE' ) ? Imagick::ALPHACHANNEL_REMOVE : 12 );
+                        }
+                        catch ( Exception $e ) {
+                                // Ignore.
+                        }
+                }
+        }
 }

tests/phpunit/tests/image/editor_imagick.php

@@ -531 +531 @@
                 $this->assertImageAlphaAtPointImagick( $save_to_file, array( 0, 0 ), $pre_rotate_alpha );
                 unlink( $save_to_file );
         }
+
+        /**
+         * @ticket 39216
+         */
+        public function test_remove_alpha_pdf_preview() {
+                if ( ! wp_image_editor_supports( array( 'mime_type' => 'application/pdf' ) ) ) {
+                        $this->markTestSkipped( 'Rendering PDFs is not supported on this system.' );
+                }
+
+                $test_file = 'test_alpha.pdf';
+                $test_path = DIR_TESTDATA . '/images/' . $test_file;
+                $attachment_id = $this->factory->attachment->create_upload_object( $test_path );
+                $this->assertNotEmpty( $attachment_id );
+
+                $attached_file = get_attached_file( $attachment_id );
+                $this->assertNotEmpty( $attached_file );
+
+                $check = image_get_intermediate_size( $attachment_id, 'thumbnail' );
+                $this->assertNotEmpty( $check['file'] );
+                $check_file = str_replace( $test_file, $check['file'], $attached_file ); 
+
+                $imagick = new Imagick( $check_file );
+                $expected = array( 'r' => 1, 'g' => 1, 'b' => 1, 'a' => 1 ); // White.
+                $output = array_map( 'ceil', $imagick->getImagePixelColor( 1, 1 )->getColor( true /*normalized*/ ) );
+                $this->assertEquals( $expected, $output ); // Allow for floating point equivalence.
+                $imagick->destroy();
+
+                $check = image_get_intermediate_size( $attachment_id, 'full' );
+                $this->assertNotEmpty( $check['file'] );
+                $check_file = str_replace( $test_file, $check['file'], $attached_file ); 
+
+                $imagick = new Imagick( $check_file );
+                $expected = array( 'r' => 1, 'g' => 1, 'b' => 1, 'a' => 1 ); // White.
+                $output = array_map( 'ceil', $imagick->getImagePixelColor( 100, 100 )->getColor( true /*normalized*/ ) );
+                $this->assertEquals( $expected, $output ); // Allow for floating point equivalence.
+                $imagick->destroy();
+        }
 }