From: Patrick Lam Date: Sun, 5 Mar 2006 15:33:46 +0000 (+0000) Subject: Because we hacked FcPatternGet, we don't really need to expand the filename X-Git-Tag: fc-2_3_95~44 X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=9226e04c69d7cb472999b1d8bc0cfa3c28054ebe;p=fontconfig.git Because we hacked FcPatternGet, we don't really need to expand the filename again in FcPatternGetString. --- diff --git a/ChangeLog b/ChangeLog index ba86c68..20d8f85 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2006-03-05 Patrick Lam + * src/fcpat.c (FcPatternGetString): + + Because we hacked FcPatternGet, we don't really need to expand the + filename again in FcPatternGetString. + 2006-03-05 Patrick Lam * src/fcpat.c (FcPatternGetString, FcPatternGet): diff --git a/src/fcpat.c b/src/fcpat.c index 980b16e..a2eb640 100644 --- a/src/fcpat.c +++ b/src/fcpat.c @@ -1214,9 +1214,6 @@ FcPatternGetString (const FcPattern *p, const char *object, int id, FcChar8 ** s if (v.type != FcTypeString) return FcResultTypeMismatch; - if (FcObjectToPtr(object) == FcObjectToPtr(FC_FILE)) - return FcPatternGetFile (p, object, id, s); - *s = (FcChar8 *) v.u.s; return FcResultMatch; }