changeset 96592:0ef6933bf3bd

(ftfont_resolve_generic_family): Remove foundry from pattern before matching the generic family.
author Andreas Schwab <schwab@suse.de>
date Thu, 10 Jul 2008 13:13:21 +0000
parents cdef905b2972
children f8c90f2b764e
files src/ChangeLog src/ftfont.c
diffstat 2 files changed, 6 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog	Thu Jul 10 06:54:56 2008 +0000
+++ b/src/ChangeLog	Thu Jul 10 13:13:21 2008 +0000
@@ -1,3 +1,8 @@
+2008-07-10  Andreas Schwab  <schwab@suse.de>
+
+	* ftfont.c (ftfont_resolve_generic_family): Remove foundry from
+	pattern before matching the generic family.
+
 2008-07-10  Dan Nicolaescu  <dann@ics.uci.edu>
 
 	* unexec.c:
--- a/src/ftfont.c	Thu Jul 10 06:54:56 2008 +0000
+++ b/src/ftfont.c	Thu Jul 10 13:13:21 2008 +0000
@@ -221,6 +221,7 @@
   pattern = FcPatternDuplicate (pattern);
   if (! pattern)
     goto err;
+  FcPatternDel (pattern, FC_FOUNDRY);
   FcPatternDel (pattern, FC_FAMILY);
   FcPatternAddString (pattern, FC_FAMILY, SYMBOL_FcChar8 (family));
   FcConfigSubstitute (NULL, pattern, FcMatchPattern);