summaryrefslogtreecommitdiff
path: root/xc/lib/font/fontfile
diff options
context:
space:
mode:
authorgildea <empty>1994-02-03 16:24:42 +0000
committergildea <empty>1994-02-03 16:24:42 +0000
commit81a34cf1b4fee95826e865534f1c6e0123d344f8 (patch)
tree2d46b9e1f0894ba6cc7d7790b71bea5755b97489 /xc/lib/font/fontfile
parent47765f96f211e2e50ac191fff24aeebd7bc0631e (diff)
find matching bitmap before finding scalable font. Fix XBUG #6414.
Diffstat (limited to 'xc/lib/font/fontfile')
-rw-r--r--xc/lib/font/fontfile/fontfile.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/xc/lib/font/fontfile/fontfile.c b/xc/lib/font/fontfile/fontfile.c
index 224cff97a..2057611c9 100644
--- a/xc/lib/font/fontfile/fontfile.c
+++ b/xc/lib/font/fontfile/fontfile.c
@@ -1,5 +1,5 @@
/*
- * $XConsortium: fontfile.c,v 1.17 94/02/03 10:07:09 gildea Exp $
+ * $XConsortium: fontfile.c,v 1.18 94/02/03 10:35:46 gildea Exp $
*
* Copyright 1991 Massachusetts Institute of Technology
*
@@ -241,6 +241,9 @@ FontFileOpenFont (client, fpe, flags, name, namelen, format, fmask,
tmpName.name = lowerName;
tmpName.length = namelen;
tmpName.ndashes = FontFileCountDashes (lowerName, namelen);
+ if ((entry = FontFileFindNameInDir (&dir->nonScalable, &tmpName))
+ && entry->type == FONT_ENTRY_BITMAP)
+ goto skip_to_bitmapped_font;
/* Match XLFD patterns */
ranges = FontParseRanges(lowerName, &nranges);
@@ -385,6 +388,7 @@ FontFileOpenFont (client, fpe, flags, name, namelen, format, fmask,
}
if ((!entry || entry->type != FONT_ENTRY_ALIAS) && ranges)
xfree(ranges);
+ skip_to_bitmapped_font:
if (entry)
{
int len;