diff options
| author | Pierre Joye <pajoye@php.net> | 2004-12-09 10:11:11 +0000 |
|---|---|---|
| committer | Pierre Joye <pajoye@php.net> | 2004-12-09 10:11:11 +0000 |
| commit | 5efb3301b22913d1d1d87ba4566b94540662028c (patch) | |
| tree | bbba85350e5737c4084f684abda23b0dcac2b764 | |
| parent | cbdd728a8d3c47b17d75a628f40685dd01c58ea4 (diff) | |
| download | php-git-5efb3301b22913d1d1d87ba4566b94540662028c.tar.gz | |
- MFH: #28598, attempt to restore MS Symbol ttf support
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | ext/gd/libgd/gdft.c | 2 |
2 files changed, 2 insertions, 1 deletions
@@ -85,6 +85,7 @@ PHP NEWS - Fixed bug #29211 (SoapClient doesn't request wsdl through proxy). (Rob) - Fixed bug #28817 (Var problem when extending domDocument). (Georg) - Fixed bug #28599 (strtotime fails with zero base time). (Derick) +- Fixed bug #28598 (Lost support for MS Symbol fonts). (Pierre) - Fixed bug #28220 (mb_strwidth() returns wrong width values for some hangul characters). (Moriyoshi) - Fixed bug #28209 (strtotime("now")). (Derick) diff --git a/ext/gd/libgd/gdft.c b/ext/gd/libgd/gdft.c index 5e74b5757f..cf79fe3129 100644 --- a/ext/gd/libgd/gdft.c +++ b/ext/gd/libgd/gdft.c @@ -915,7 +915,7 @@ gdImageStringFTEx (gdImage * im, int *brect, int fg, char *fontlist, double ptsi /* EAM DEBUG */ #if (defined(FREETYPE_MAJOR) && ((FREETYPE_MAJOR == 2 && ((FREETYPE_MINOR == 1 && FREETYPE_PATCH >= 3) || FREETYPE_MINOR > 1) || FREETYPE_MAJOR > 2))) - if (font->face->charmap->encoding == FT_ENCODING_MS_SYMBOL) { + if (font->face->charmap->encoding == FT_ENCODING_MS_SYMBOL && strcmp(font->face->family_name, "Symbol") == 0) { /* I do not know the significance of the constant 0xf000. * It was determined by inspection of the character codes * stored in Microsoft font symbol. |