mirror of
https://github.com/X11Libre/xserver.git
synced 2026-09-27 21:22:26 +00:00
Merge branch 'master' into XACE-SELINUX
Conflicts: hw/xnest/Pixmap.c include/dix.h
This commit is contained in:
commit
2d17f47cc7
46 changed files with 92 additions and 977 deletions
|
|
@ -1292,7 +1292,7 @@ ProcRenderAddGlyphs (ClientPtr client)
|
|||
|
||||
pDstPix = (pScreen->CreatePixmap) (pScreen,
|
||||
width, height, depth,
|
||||
CREATE_PIMXAP_USAGE_GLYPH_PICTURE);
|
||||
CREATE_PIXMAP_USAGE_GLYPH_PICTURE);
|
||||
|
||||
GlyphPicture (glyph)[screen] = pDst =
|
||||
CreatePicture (0, &pDstPix->drawable,
|
||||
|
|
|
|||
Loading…
Reference in a new issue