Skip bitmap fonts which can't even get it together enough to declare a

family name; this appears to reproduce previous fontconfig behaviour.
reviewed by: plam
This commit is contained in:
Patrick Lam 2006-02-13 21:51:11 +00:00
parent d00c3cb5e0
commit 5657098e29
2 changed files with 13 additions and 0 deletions

View File

@ -1,3 +1,11 @@
2006-02-13 Mike Fabian <mfabian@suse.de>
reviewed by: plam
* src/fcfreetype.c (FcFreeTypeQuery):
Skip bitmap fonts which can't even get it together enough to
declare a family name; this appears to reproduce previous
fontconfig behaviour.
2006-02-10 Takashi Iwai <tiwai@suse.de> 2006-02-10 Takashi Iwai <tiwai@suse.de>
reviewed by: plam reviewed by: plam
* src/fccache.c (FcDirCacheOpen): * src/fccache.c (FcDirCacheOpen):

View File

@ -1609,6 +1609,11 @@ FcFreeTypeQuery (const FcChar8 *file,
int value; int value;
BDF_PropertyRec prop; BDF_PropertyRec prop;
/* skip bitmap fonts which do not even have a family name */
rc = FT_Get_BDF_Property(face, "FAMILY_NAME", &prop);
if (rc != 0 || prop.type != BDF_PROPERTY_TYPE_ATOM)
goto bail2;
rc = FT_Get_BDF_Property(face, "POINT_SIZE", &prop); rc = FT_Get_BDF_Property(face, "POINT_SIZE", &prop);
if(rc == 0 && prop.type == BDF_PROPERTY_TYPE_INTEGER) if(rc == 0 && prop.type == BDF_PROPERTY_TYPE_INTEGER)
value = prop.u.integer; value = prop.u.integer;