system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-18 11:38:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ignore broken fonts when building cache file.

Browse source
This commit is contained in:
Drew Ronneberg 2000-07-15 19:43:33 +00:00 committed by Alexandre Julliard
parent 72b93d47f0
commit f6e4096194
1 changed files with 40 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
graphics/x11drv/xfont.c
View file

@ -1821,6 +1821,7 @@ static int XFONT_BuildMetrics(char** x_pattern, int res, unsigned x_checksum, in
{
int i;
fontInfo* fi = NULL;
fontResource* fr, *pfr;
int n_ff = 0;
MESSAGE("Building font metrics. This may take some time...\n");
@ -1828,7 +1829,6 @@ static int XFONT_BuildMetrics(char** x_pattern, int res, unsigned x_checksum, in
{
char* typeface;
LFD* lfd;
fontResource* fr, *pfr;
int j;
char buffer[MAX_LFD_LENGTH];
char* lpstr;
@ -1940,6 +1940,45 @@ static int XFONT_BuildMetrics(char** x_pattern, int res, unsigned x_checksum, in
}
if( fi ) HeapFree(GetProcessHeap(), 0, fi);
/* Scan through the font list and remove FontResorce(s) (fr)
* that have no associated Fontinfo(s) (fi).
* This code is necessary because XFONT_ReadCachedMetrics
* assumes that there is at least one fi associated with a fr.
* This assumption is invalid for TT font
* -altsys-ms outlook-medium-r-normal--0-0-0-0-p-0-microsoft-symbol.
*/
fr = fontList;
while (!fr->fi_count)
{
fontList = fr->next;
HeapFree(GetProcessHeap(), 0, fr->resource);
HeapFree(GetProcessHeap(), 0, fr);
fr = fontList;
n_ff--;
}
fr = fontList;
while (fr->next)
{
if (!fr->next->fi_count)
{
pfr = fr->next;
fr->next = fr->next->next;
HeapFree(GetProcessHeap(), 0, pfr->resource);
HeapFree(GetProcessHeap(), 0, pfr);
n_ff--;
}
else
fr = fr->next;
}
return n_ff;
}