From 1df6557b493ab6f6707e7c7a1db09bb4230d5bcc Mon Sep 17 00:00:00 2001 From: Jouni Ahto Date: Fri, 7 Jul 2000 14:00:50 +0000 Subject: [PATCH] - 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. --- ext/gd/gdttf.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/ext/gd/gdttf.c b/ext/gd/gdttf.c index 3db6b806e5..14b1744552 100644 --- a/ext/gd/gdttf.c +++ b/ext/gd/gdttf.c @@ -398,7 +398,8 @@ a->have_char_map_Roman = 0; 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++; @@ -418,11 +419,6 @@ a->have_char_map_Roman = 0; 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)); a->matrix.xy = - a->matrix.yx; -- 2.40.0