diff options
| author | Keith Packard <keithp@keithp.com> | 2015-09-01 18:50:55 -0700 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2016-07-18 15:25:59 -0400 |
| commit | 05a793f5b3c40747d5a92a076def7f4fb673c7e7 (patch) | |
| tree | 222f652ac4e1b982fd45e5f79479b1caf10526d1 /mi | |
| parent | 950ffb8d6fd1480f305e38c571bda44f247f1de2 (diff) | |
dix: Switch to the libXfont2 API (v2)
This new libXfont API eliminates exposing internal X server symbols to
the font library, replacing those with a struct full of the entire API
needed to use that library.
v2: Use libXfont2 instead of libXfont_2
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
Diffstat (limited to 'mi')
| -rw-r--r-- | mi/miglblt.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mi/miglblt.c b/mi/miglblt.c index 46268aee9..68be5b914 100644 --- a/mi/miglblt.c +++ b/mi/miglblt.c @@ -53,7 +53,7 @@ SOFTWARE. #include <X11/Xproto.h> #include "misc.h" #include <X11/fonts/fontstruct.h> -#include <X11/fonts/fontutil.h> +#include <X11/fonts/libxfont2.h> #include "dixfontstr.h" #include "gcstruct.h" #include "windowstr.h" @@ -186,13 +186,13 @@ miImageGlyphBlt(DrawablePtr pDrawable, GC * pGC, int x, int y, unsigned int ngly void *pglyphBase /* start of array of glyphs */ ) { - ExtentInfoRec info; /* used by QueryGlyphExtents() */ + ExtentInfoRec info; /* used by xfont2_query_glyph_extents() */ ChangeGCVal gcvals[3]; int oldAlu, oldFS; unsigned long oldFG; xRectangle backrect; - QueryGlyphExtents(pGC->font, ppci, (unsigned long) nglyph, &info); + xfont2_query_glyph_extents(pGC->font, ppci, (unsigned long) nglyph, &info); if (info.overallWidth >= 0) { backrect.x = x; |