mirror_php/wordpress
1
0
Fork 0
mirror of git://develop.git.wordpress.org/ synced 2025-04-05 04:33:18 +02:00
Code Issues Actions 10 Packages Projects Releases Wiki Activity

Media: Use version_compare() for Imagick version check when removing alpha.

Browse Source 
Previously `remove_pdf_alpha_channel()` used `Imagick::getVersion()` to validate the environment is capable of handling alpha. This was the incorrect function to use to check the module version as it will only provide the ImageMagick API version. This patch adjusts to instead use `phpversion()` as this is the correct method to get the Imagick version needed to determine alpha compatibility. This fixes a number of host tests that have been correctly failing on subsets of environments. Serendipidously, sometimes the API version was high enough to avoid shining light on this problem.

Props swissspidy, joedolson, antpb.
Fixes #60798.


git-svn-id: https://develop.svn.wordpress.org/trunk@58415 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Anthony Burchell 2024-06-14 14:41:52 +00:00
parent 8f273362c8
commit 0e7e596dd3
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/wp-includes/class-wp-image-editor-imagick.php
View File

@ -775,9 +775,8 @@ class WP_Image_Editor_Imagick extends WP_Image_Editor {
* @since 6.4.0
*/
protected function remove_pdf_alpha_channel() {
$version = Imagick::getVersion();
// Remove alpha channel if possible to avoid black backgrounds for Ghostscript >= 9.14. RemoveAlphaChannel added in ImageMagick 6.7.5.
if ( $version['versionNumber'] >= 0x675 ) {
if ( version_compare( phpversion( 'imagick' ), '9.14', '>=' ) ) {
try {
// Imagick::ALPHACHANNEL_REMOVE mapped to RemoveAlphaChannel in PHP imagick 3.2.0b2.
$this->image->setImageAlphaChannel( defined( 'Imagick::ALPHACHANNEL_REMOVE' ) ? Imagick::ALPHACHANNEL_REMOVE : 12 );