diff options
| author | Pierre Joye <pajoye@php.net> | 2004-12-09 14:20:20 +0000 |
|---|---|---|
| committer | Pierre Joye <pajoye@php.net> | 2004-12-09 14:20:20 +0000 |
| commit | 87cae0e01b288e62cec07af9eb203e583f3f6bd8 (patch) | |
| tree | 47d0b8f44685baee37f3dc3f56e0b74f49c82233 /ext | |
| parent | b4b338a8d11d7f69c5e251a154f86a2d78c7fe7c (diff) | |
| download | php-git-87cae0e01b288e62cec07af9eb203e583f3f6bd8.tar.gz | |
- MFH: #28598, attempt to restore MS Symbol ttf support
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/gd/libgd/gdft.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ext/gd/libgd/gdft.c b/ext/gd/libgd/gdft.c index aebe16e79d..ccf1a91f5d 100644 --- a/ext/gd/libgd/gdft.c +++ b/ext/gd/libgd/gdft.c @@ -958,7 +958,6 @@ gdImageStringFTEx (gdImage * im, int *brect, int fg, char *fontlist, double ptsi while (*next) { ch = *next; - /* carriage returns */ if (ch == '\r') { penf.x = 0; @@ -985,11 +984,12 @@ 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. */ + /* Convert to the Symbol glyph range only for a Symbol family member */ len = gdTcl_UtfToUniChar (next, &ch); ch |= 0xf000; next += len; @@ -1060,7 +1060,7 @@ gdImageStringFTEx (gdImage * im, int *brect, int fg, char *fontlist, double ptsi FT_Set_Transform(face, &matrix, NULL); /* Convert character code to glyph index */ glyph_index = FT_Get_Char_Index(face, ch); - + /* retrieve kerning distance and move pen position */ if (use_kerning && previous && glyph_index) { FT_Get_Kerning(face, previous, glyph_index, ft_kerning_default, &delta); |