archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-18 15:08:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

- Restore testing for Unicode charmap to what it was, it was working(?), this

Browse source 
shouldn't have any effect on other charmaps.
- Remove bogus message about not finding any Unicode mapping table.
This commit is contained in:
Jouni Ahto 2000-07-07 14:00:50 +00:00
parent 99c6e63e66
commit 1df6557b49
1 changed files with 2 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
ext/gd/gdttf.c
View file

@ -398,7 +398,8 @@ a->have_char_map_Roman = 0;
for (i = 0; i < n; i++) { for (i = 0; i < n; i++) {
TT_Get_CharMap_ID(a->face, i, &platform, &encoding); TT_Get_CharMap_ID(a->face, i, &platform, &encoding);
if ((platform == 3 && encoding == 1) /* Windows Unicode */ 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); TT_Get_CharMap(a->face, i, &a->char_map_Unicode);
a->have_char_map_Unicode = 1; a->have_char_map_Unicode = 1;
map_found++; map_found++;
@ -418,11 +419,6 @@ a->have_char_map_Roman = 0;
return NULL; 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.xx = (TT_Fixed) (a->cos_a * (1<<16));
a->matrix.yx = (TT_Fixed) (a->sin_a * (1<<16)); a->matrix.yx = (TT_Fixed) (a->sin_a * (1<<16));
a->matrix.xy = - a->matrix.yx; a->matrix.xy = - a->matrix.yx;