- MFH: #28598, attempt to restore MS Symbol ttf support

diff --git a/NEWS b/NEWS
index 606c626e43fad95c7124fb2e9fbdb8a63a6e0b88..5951a3522a30c34075e61963cff4912f12e4098e 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -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 5e74b5757f92031bd48cd880015483a8abd70a57..cf79fe31298d2471ebffe1c99d10b1432a11ee6f 100644 (file)
--- 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.