mirror of
https://github.com/php/php-src.git
synced 2024-10-01 14:56:10 +00:00
Merge branch 'PHP-5.5'
* PHP-5.5: temporary disable WBM detection with system libgd, as gdGetC, getmbi and skipheader not exported
This commit is contained in:
commit
41ef288ced
@ -2411,6 +2411,8 @@ static int _php_image_type (char data[8])
|
||||
} else if (!memcmp(data, php_sig_gif, 3)) {
|
||||
return PHP_GDIMG_TYPE_GIF;
|
||||
}
|
||||
/* Temporary disabled, as gdGetC, getmbi and skipheader not exported in system libgd */
|
||||
#if HAVE_GD_BUNDLED
|
||||
#ifdef HAVE_GD_WBMP
|
||||
else {
|
||||
gdIOCtx *io_ctx;
|
||||
@ -2432,6 +2434,7 @@ static int _php_image_type (char data[8])
|
||||
}
|
||||
}
|
||||
}
|
||||
#endif
|
||||
#endif
|
||||
return -1;
|
||||
#endif
|
||||
|
Loading…
Reference in New Issue
Block a user