cvs: php4 /ext/gd gdttf.c

jah Fri Jul 7 07:00:50 2000 EDT Modified files: /php4/ext/gd gdttf.c Log: - Restore testing for Unicode charmap to what it was, it was working(?), this shouldn't have any effect on other charmaps. - Remove bogus message about not finding any Unicode mapping table. Index: php4/ext/gd/gdttf.c diff -u php4/ext/gd/gdttf.c:1.10 php4/ext/gd/gdttf.c:1.11 --- php4/ext/gd/gdttf.c:1.10 Thu Jul 6 01:13:33 2000 +++ php4/ext/gd/gdttf.c Fri Jul 7 07:00:50 2000 @@ -2,7 +2,7 @@ /* */ /* John Ellson ellson@lucent.com */ -/* $Id: gdttf.c,v 1.10 2000/07/06 08:13:33 ssb Exp $ */ +/* $Id: gdttf.c,v 1.11 2000/07/07 14:00:50 jah Exp $ */ #if WIN32|WINNT #include "config.w32.h" @@ -398,7 +398,8 @@ for (i = 0; i < n; i++) { TT_Get_CharMap_ID(a->face, i, &platform, &encoding); if ((platform == 3 && encoding == 1) /* Windows Unicode */ - || (platform == 0 && encoding == 0)) { /* ?? Unicode */ + || (platform == 2 && encoding == 1) + || (platform == 0)) { /* ?? Unicode */ TT_Get_CharMap(a->face, i, &a->char_map_Unicode); a->have_char_map_Unicode = 1; map_found++; @@ -417,11 +418,6 @@ *error = "Unable to find a CharMap that I can handle"; return NULL; } - - if (i == n) { - *error = "Sorry, but this font doesn't contain any Unicode mapping table"; - return NULL; - } a->matrix.xx = (TT_Fixed) (a->cos_a * (1<<16)); a->matrix.yx = (TT_Fixed) (a->sin_a * (1<<16));