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

diff --git a/ChangeLog b/ChangeLog
index 7e338d0b8379549de3f1eca01048c8d9b858dced..5ee8fabb1efc2329e70be10346338ccce4dc5b05 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
        reviewed by: plam
        * src/fccache.c (FcDirCacheOpen):

diff --git a/src/fcfreetype.c b/src/fcfreetype.c
index 27dff11cff821f631f9a9144e27ef38d06751fdc..9dc45fc3c347e395d5dea60855f6388eca3d7dc0 100644 (file)
--- a/src/fcfreetype.c
+++ b/src/fcfreetype.c
@@ -1609,6 +1609,11 @@ FcFreeTypeQuery (const FcChar8   *file,
             int value;
             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);
             if(rc == 0 && prop.type == BDF_PROPERTY_TYPE_INTEGER)
                 value = prop.u.integer;