diff options
| author | Christoph M. Becker <cmb@php.net> | 2016-09-23 15:22:45 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmbecker69@gmx.de> | 2016-09-23 15:49:21 +0200 |
| commit | bf35b31f56c141d16ae51cbcb0499fbb701ccb81 (patch) | |
| tree | d952799a9456113aacc8681d6d89c479a810cc1f | |
| parent | 974ba6be7a20d277723e6e7f9976219796dba7c0 (diff) | |
| download | php-git-bf35b31f56c141d16ae51cbcb0499fbb701ccb81.tar.gz | |
Fix FreeType tests using UTF-8 font file names
UTF-8 font file names are not yet supported on Windows[1], so we're skipping
the respective tests on this platform, but enable them on other platforms.
[1] <http://news.php.net/php.internals.win/1142>
| -rw-r--r-- | ext/gd/tests/bug48732-mb.phpt | 8 | ||||
| -rw-r--r-- | ext/gd/tests/bug48801-mb.phpt | 1 |
2 files changed, 3 insertions, 6 deletions
diff --git a/ext/gd/tests/bug48732-mb.phpt b/ext/gd/tests/bug48732-mb.phpt index 7713e51190..42871ee206 100644 --- a/ext/gd/tests/bug48732-mb.phpt +++ b/ext/gd/tests/bug48732-mb.phpt @@ -4,12 +4,8 @@ Bug #48732 (TTF Bounding box wrong for letters below baseline) <?php if(!extension_loaded('gd')){ die('skip gd extension not available'); } if(!function_exists('imagefttext')) die('skip imagefttext() not available'); - if (substr(PHP_OS, 0, 3) != 'WIN') { - die('skip.. only for Windows'); - } + if (substr(PHP_OS, 0, 3) == 'WIN') die('skip UTF-8 font file names not yet supported on Windows'); ?> ---XFAIL-- -seems freetype issue, to investigate --FILE-- <?php $cwd = dirname(__FILE__); @@ -24,4 +20,4 @@ echo 'Left Bottom: (' . $bbox[0] . ', ' . $bbox[1] . ')'; --CLEAN-- <?php @unlink(dirname(__FILE__) . '/bug48732私はガラスを食べられます.png'); ?> --EXPECTF-- -Left Bottom: (0, 47) +Left Bottom: (0, 46) diff --git a/ext/gd/tests/bug48801-mb.phpt b/ext/gd/tests/bug48801-mb.phpt index c2b6b455ab..a2f6d28a82 100644 --- a/ext/gd/tests/bug48801-mb.phpt +++ b/ext/gd/tests/bug48801-mb.phpt @@ -4,6 +4,7 @@ Bug #48801 (Problem with imagettfbbox) <?php if(!extension_loaded('gd')){ die('skip gd extension not available'); } if(!function_exists('imageftbbox')) die('skip imageftbbox() not available'); + if (substr(PHP_OS, 0, 3) == 'WIN') die('skip UTF-8 font file names not yet supported on Windows'); ?> --FILE-- <?php |