diff options
| author | Stanislav Malyshev <stas@php.net> | 2016-11-25 15:31:22 -0800 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2016-11-25 15:31:22 -0800 |
| commit | ffb65ba833a2d999dd2a0771ebd8aac672271a26 (patch) | |
| tree | 89ebd75be4050b61f9ba2439746a51b725e77e02 | |
| parent | 2cc3df32520c14f4721f80d9f90cb8dd5c6d2cdb (diff) | |
| parent | 51ba53ed0fe761b15950f8b07af2381ad54cdb02 (diff) | |
| download | php-git-ffb65ba833a2d999dd2a0771ebd8aac672271a26.tar.gz | |
Merge branch 'PHP-7.1' of git.php.net:php-src into PHP-7.1
* 'PHP-7.1' of git.php.net:php-src:
Fix #73582: Failing ext/gd/tests/imagettftext_charmap_order.phpt
| -rw-r--r-- | ext/gd/tests/imagettftext_charmap_order.phpt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/ext/gd/tests/imagettftext_charmap_order.phpt b/ext/gd/tests/imagettftext_charmap_order.phpt index 2be20b7697..221e6b851a 100644 --- a/ext/gd/tests/imagettftext_charmap_order.phpt +++ b/ext/gd/tests/imagettftext_charmap_order.phpt @@ -4,6 +4,7 @@ Font charmap order is deterministic based on order in the font, use the selected <?php if(!extension_loaded('gd')){ die('skip gd extension not available'); } if(!function_exists('imagettftext')) die('skip imagettftext() not available'); + if(gd_info()['JIS-mapped Japanese Font Support']) die('skip JIS-mapped Japanese Font Support not supported'); ?> --FILE-- <?php |