pajoye Thu Dec 9 09:20:20 2004 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/gd/libgd gdft.c
Log:
- MFH: #28598, attempt to restore MS Symbol ttf support
http://cvs.php.net/diff.php/php-src/ext/gd/libgd/gdft.c?r1=1.11.2.18&r2=1.11.2.19&ty=u
Index: php-src/ext/gd/libgd/gdft.c
diff -u php-src/ext/gd/libgd/gdft.c:1.11.2.18
php-src/ext/gd/libgd/gdft.c:1.11.2.19
--- php-src/ext/gd/libgd/gdft.c:1.11.2.18 Wed Jun 9 10:50:33 2004
+++ php-src/ext/gd/libgd/gdft.c Thu Dec 9 09:20:20 2004
@@ -958,7 +958,6 @@
while (*next) {
ch = *next;
-
/* carriage returns */
if (ch == '\r') {
penf.x = 0;
@@ -985,11 +984,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.
*/
+ /* 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 @@
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);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
