cleanup
This commit is contained in:
parent
b01bf646f1
commit
68ff99c414
|
@ -931,9 +931,6 @@ FcPatternGetLangSet (const FcPattern *p, const char *object, int n, FcLangSet **
|
||||||
FcPublic FcResult
|
FcPublic FcResult
|
||||||
FcPatternGetRange (const FcPattern *p, const char *object, int id, FcRange **r);
|
FcPatternGetRange (const FcPattern *p, const char *object, int id, FcRange **r);
|
||||||
|
|
||||||
FcPublic FcResult
|
|
||||||
FcPatternFindFont (const FcPattern *p, FcChar8 **s);
|
|
||||||
|
|
||||||
FcPublic FcPattern *
|
FcPublic FcPattern *
|
||||||
FcPatternVaBuild (FcPattern *p, va_list va);
|
FcPatternVaBuild (FcPattern *p, va_list va);
|
||||||
|
|
||||||
|
|
30
src/fcpat.c
30
src/fcpat.c
|
@ -1105,36 +1105,6 @@ FcPatternGetRange (const FcPattern *p, const char *object, int id, FcRange **r)
|
||||||
return FcPatternObjectGetRange (p, FcObjectFromName (object), id, r);
|
return FcPatternObjectGetRange (p, FcObjectFromName (object), id, r);
|
||||||
}
|
}
|
||||||
|
|
||||||
FcResult
|
|
||||||
FcPatternFindFont (const FcPattern *p, FcChar8 **s)
|
|
||||||
{
|
|
||||||
FcChar8 *file;
|
|
||||||
FcResult ret = FcResultNoMatch;
|
|
||||||
|
|
||||||
if (FcPatternObjectGetString (p, FC_FILE_OBJECT, 0, &file) == FcResultMatch)
|
|
||||||
{
|
|
||||||
FcChar8 *dir = FcStrDirname (file);
|
|
||||||
const FcChar8 *alias;
|
|
||||||
|
|
||||||
if ((alias = FcDirCacheFindAliasPath (dir)))
|
|
||||||
{
|
|
||||||
FcChar8 *font = FcStrBasename (file);
|
|
||||||
|
|
||||||
if (s)
|
|
||||||
*s = FcStrBuildFilename (alias, font, NULL);
|
|
||||||
FcStrFree (font);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
if (s)
|
|
||||||
*s = FcStrdup (file);
|
|
||||||
}
|
|
||||||
ret = FcResultMatch;
|
|
||||||
FcStrFree (dir);
|
|
||||||
}
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
FcPattern *
|
FcPattern *
|
||||||
FcPatternDuplicate (const FcPattern *orig)
|
FcPatternDuplicate (const FcPattern *orig)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue