pajoye Sat Nov 20 08:09:46 2004 EDT
Modified files:
/php-src/ext/gd/libgd gdft.c
Log:
- Attempt to fix #28598, bug introduced in GD (around php 4.3.4)
The way they fix MS Symbol are wrong, multiple faces support hould added
later, safer.
Please test it with your weird fonts, if it works, MFH will be done.
http://cvs.php.net/diff.php/php-src/ext/gd/libgd/gdft.c?r1=1.35&r2=1.36&ty=u
Index: php-src/ext/gd/libgd/gdft.c
diff -u php-src/ext/gd/libgd/gdft.c:1.35 php-src/ext/gd/libgd/gdft.c:1.36
--- php-src/ext/gd/libgd/gdft.c:1.35 Wed Jun 9 10:50:05 2004
+++ php-src/ext/gd/libgd/gdft.c Sat Nov 20 08:09:45 2004
@@ -915,10 +915,12 @@
/* 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.
+ * Added by Pierre ([EMAIL PROTECTED]):
+ * Convert to the Symbol glyph range only for a Symbol
family member
*/
len = gdTcl_UtfToUniChar (next, &ch);
ch |= 0xf000;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
