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 /miext | |
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 'miext')
-rw-r--r-- | miext/damage/damage.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/miext/damage/damage.c b/miext/damage/damage.c index ce1cd3247..17c2abfff 100644 --- a/miext/damage/damage.c +++ b/miext/damage/damage.c @@ -32,7 +32,7 @@ #include <X11/fonts/font.h> #include "dixfontstr.h" #include <X11/fonts/fontstruct.h> -#include <X11/fonts/fontutil.h> +#include <X11/fonts/libxfont2.h> #include "mi.h" #include "regionstr.h" #include "globals.h" @@ -1249,7 +1249,7 @@ damageDamageChars(DrawablePtr pDrawable, ExtentInfoRec extents; BoxRec box; - QueryGlyphExtents(font, charinfo, n, &extents); + xfont2_query_glyph_extents(font, charinfo, n, &extents); if (imageblt) { if (extents.overallWidth > extents.overallRight) extents.overallRight = extents.overallWidth; |