From 73e8ae3ac8890af2dd8dd769686e2d34b749e3d0 Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Sat, 3 May 2008 17:43:39 -0700 Subject: [PATCH] Remove size and dpi values from bitmap fonts. Bug 8765. The only relevant information is the pixel size; don't report anything else. --- src/fcfreetype.c | 34 ---------------------------------- 1 file changed, 34 deletions(-) diff --git a/src/fcfreetype.c b/src/fcfreetype.c index 0612c17..4ee8a63 100644 --- a/src/fcfreetype.c +++ b/src/fcfreetype.c @@ -1700,40 +1700,6 @@ FcFreeTypeQueryFace (const FT_Face face, goto bail2; if (!FcPatternAddBool (pat, FC_ANTIALIAS, FcFalse)) goto bail2; -#if HAVE_FT_GET_BDF_PROPERTY - if(face->num_fixed_sizes == 1) { - int rc; - int value; - - /* 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; - else if(rc == 0 && prop.type == BDF_PROPERTY_TYPE_CARDINAL) - value = prop.u.cardinal; - else - goto nevermind; - if(!FcPatternAddDouble(pat, FC_SIZE, value / 10.0)) - goto nevermind; - - rc = FT_Get_BDF_Property(face, "RESOLUTION_Y", &prop); - if(rc == 0 && prop.type == BDF_PROPERTY_TYPE_INTEGER) - value = prop.u.integer; - else if(rc == 0 && prop.type == BDF_PROPERTY_TYPE_CARDINAL) - value = prop.u.cardinal; - else - goto nevermind; - if(!FcPatternAddDouble(pat, FC_DPI, (double)value)) - goto nevermind; - - } - nevermind: - ; -#endif } #if HAVE_FT_GET_X11_FONT_FORMAT /*