diff options
| author | marha <marha@users.sourceforge.net> | 2011-09-19 13:39:03 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-09-19 13:39:03 +0200 |
| commit | 1678a69116d1c6ce900fe15f7813613bb28416dd (patch) | |
| tree | 9589536f6b4bd60b34f90cf5ed20240d40bbb38c /libXft/src/xftfont.c | |
| parent | 9d911bc1246139019e555f443e934677a067bc0a (diff) | |
| parent | b2c925e360e2c366526de15b44603f855f94139c (diff) | |
| download | vcxsrv-1678a69116d1c6ce900fe15f7813613bb28416dd.tar.gz vcxsrv-1678a69116d1c6ce900fe15f7813613bb28416dd.tar.bz2 vcxsrv-1678a69116d1c6ce900fe15f7813613bb28416dd.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
libfontenc/src/fontenc.c
Diffstat (limited to 'libXft/src/xftfont.c')
| -rw-r--r-- | libXft/src/xftfont.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libXft/src/xftfont.c b/libXft/src/xftfont.c index 70ab5d8bb..d361498db 100644 --- a/libXft/src/xftfont.c +++ b/libXft/src/xftfont.c @@ -33,7 +33,7 @@ XftFontMatch (Display *dpy, if (!XftInit (NULL)) return NULL; - + new = FcPatternDuplicate (pattern); if (!new) return NULL; @@ -100,7 +100,7 @@ XftFontOpen (Display *dpy, int screen, ...) FcPatternDestroy (pat); if (!match) return NULL; - + font = XftFontOpenPattern (dpy, match); if (!font) { @@ -129,7 +129,7 @@ XftFontOpenName (Display *dpy, int screen, const char *name) else printf ("Invalid name\n"); } - + if (!pat) return NULL; match = XftFontMatch (dpy, screen, pat, &result); @@ -146,7 +146,7 @@ XftFontOpenName (Display *dpy, int screen, const char *name) FcPatternDestroy (pat); if (!match) return NULL; - + font = XftFontOpenPattern (dpy, match); if (!font) { @@ -154,7 +154,7 @@ XftFontOpenName (Display *dpy, int screen, const char *name) printf ("No Font\n"); FcPatternDestroy (match); } - + return font; } @@ -175,7 +175,7 @@ XftFontOpenXlfd (Display *dpy, int screen, const char *xlfd) else FcPatternPrint (pat); } - + if (!pat) return NULL; match = XftFontMatch (dpy, screen, pat, &result); @@ -192,7 +192,7 @@ XftFontOpenXlfd (Display *dpy, int screen, const char *xlfd) FcPatternDestroy (pat); if (!match) return NULL; - + font = XftFontOpenPattern (dpy, match); if (!font) { @@ -200,7 +200,7 @@ XftFontOpenXlfd (Display *dpy, int screen, const char *xlfd) printf ("No Font\n"); FcPatternDestroy (match); } - + return font; } |