summaryrefslogtreecommitdiff
path: root/src/Filter.c
diff options
context:
space:
mode:
authorEgbert Eich <eich@suse.de>2004-04-23 18:43:50 +0000
committerEgbert Eich <eich@suse.de>2004-04-23 18:43:50 +0000
commit7faeec0e653838dc78d8df0c1eb10b833ff0c816 (patch)
tree8a2b0a5e90b77b365a7dc3a0407ce02a6a672ee7 /src/Filter.c
parent3cdb1c4406d51f671f60f530c557ebfca81bfd3c (diff)
downloadxorg-lib-libXrender-7faeec0e653838dc78d8df0c1eb10b833ff0c816.tar.gz
Merging XORG-CURRENT into trunkXACE-SELINUX-MERGE
Diffstat (limited to 'src/Filter.c')
-rw-r--r--src/Filter.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/src/Filter.c b/src/Filter.c
index dfc5480..3406669 100644
--- a/src/Filter.c
+++ b/src/Filter.c
@@ -1,7 +1,6 @@
/*
- * $XFree86: xc/lib/Xrender/Filter.c,v 1.1 2002/09/26 02:56:52 keithp Exp $
*
- * Copyright © 2002 Keith Packard, member of The XFree86 Project, Inc.
+ * Copyright © 2002 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
* documentation for any purpose is hereby granted without fee, provided that
@@ -27,7 +26,7 @@
XFilters *
XRenderQueryFilters (Display *dpy, Drawable drawable)
{
- XExtDisplayInfo *info = XRenderFindDisplay (dpy);
+ XRenderExtDisplayInfo *info = XRenderFindDisplay (dpy);
XRenderInfo *xri;
xRenderQueryFiltersReq *req;
xRenderQueryFiltersReply rep;
@@ -37,13 +36,13 @@ XRenderQueryFilters (Display *dpy, Drawable drawable)
int i;
long nbytes, nbytesAlias, nbytesName;
- if (!XextHasExtension (info))
+ if (!RenderHasExtension (info))
return 0;
if (!XRenderQueryFormats (dpy))
return 0;
- xri = (XRenderInfo *) info->data;
+ xri = info->info;
if (xri->minor_version < 6)
return 0;
@@ -131,7 +130,7 @@ XRenderSetPictureFilter (Display *dpy,
XFixed *params,
int nparams)
{
- XExtDisplayInfo *info = XRenderFindDisplay (dpy);
+ XRenderExtDisplayInfo *info = XRenderFindDisplay (dpy);
xRenderSetPictureFilterReq *req;
int nbytes = strlen (filter);