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/xftint.h | |
| 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/xftint.h')
| -rw-r--r-- | libXft/src/xftint.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libXft/src/xftint.h b/libXft/src/xftint.h index 3aafecf86..43f9ebec9 100644 --- a/libXft/src/xftint.h +++ b/libXft/src/xftint.h @@ -115,14 +115,14 @@ typedef struct _XftUcsHash { typedef struct _XftFtFile { struct _XftFtFile *next; int ref; /* number of font infos using this file */ - + char *file; /* file name */ int id; /* font index within that file */ FT_F26Dot6 xsize; /* current xsize setting */ FT_F26Dot6 ysize; /* current ysize setting */ FT_Matrix matrix; /* current matrix setting */ - + int lock; /* lock count; can't unload unless 0 */ FT_Face face; /* pointer to face; only valid when lock */ } XftFtFile; @@ -337,7 +337,7 @@ FcFontSet *XftListFontSets (FcFontSet **sets, int nsets, FcPattern *p, FcObjectS void XftRectCore (XftDraw *draw, _Xconst XftColor *color, - int x, + int x, int y, unsigned int width, unsigned int height); @@ -401,7 +401,7 @@ FcBool XftDrawRenderPrepare (XftDraw *draw); /* xftextent.c */ - + /* xftfont.c */ /* xftfreetype.c */ @@ -436,7 +436,7 @@ XftListFontsPatternObjects (Display *dpy, FcObjectSet *os); /* xftname.c */ -void +void _XftNameInit (void); /* xftrender.c */ |